From bf45f7da6d4301f323a8b333251b3b56b50ab265 Mon Sep 17 00:00:00 2001 From: "christian.simms" Date: Fri, 21 Mar 2008 17:04:13 +0000 Subject: [PATCH] - make test_shell not assume Python code is compiled - update results in test_shell so that it works in Postgresql - make Oracle changesets generate valid sql syntax when a modified column's default value changes to NULL --- migrate/changeset/databases/oracle.py | 2 +- test/versioning/test_shell.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/migrate/changeset/databases/oracle.py b/migrate/changeset/databases/oracle.py index f27245c..c420593 100644 --- a/migrate/changeset/databases/oracle.py +++ b/migrate/changeset/databases/oracle.py @@ -45,7 +45,7 @@ class OracleSchemaChanger(OracleSchemaGenerator,ansisql.ANSISchemaChanger): if dropdefault_hack: - column.default = sa.PassiveDefault(sa.func.null()) + column.default = sa.PassiveDefault(sa.sql.null()) if notnull_hack: column.nullable = True colspec=self.get_column_specification(column,override_nullable=null_hack) diff --git a/test/versioning/test_shell.py b/test/versioning/test_shell.py index 475cfd7..68335cc 100644 --- a/test/versioning/test_shell.py +++ b/test/versioning/test_shell.py @@ -10,8 +10,7 @@ from sqlalchemy import MetaData,Table python_version = sys.version[0:3] class Shell(fixture.Shell): - _cmd=os.path.join('python build', 'scripts-%s' % python_version, - 'migrate') + _cmd=os.path.join('python migrate', 'versioning', 'shell.py') @classmethod def cmd(cls,*p): p = map(lambda s: str(s),p) @@ -341,11 +340,11 @@ class TestShellDatabase(Shell,fixture.DB): self.assertSuccess(self.cmd('commit',upgrade_path,repos_path,'postgres','upgrade')) self.assertEquals(self.cmd_version(repos_path),1) - self.assertEquals(len(os.listdir(os.path.join(repos_path,'versions','1'))),1) + self.assertEquals(len(os.listdir(os.path.join(repos_path,'versions','1'))),2) # Add, not replace self.assertSuccess(self.cmd('commit',downgrade_path,repos_path,'postgres','downgrade','--version=1')) - self.assertEquals(len(os.listdir(os.path.join(repos_path,'versions','1'))),2) + self.assertEquals(len(os.listdir(os.path.join(repos_path,'versions','1'))),3) self.assertEquals(self.cmd_version(repos_path),1)