x/sqlalchemy-migrate
Code Issues Proposed changes

fix SA06 compatibility in tests

Browse Source
This commit is contained in:
iElectric 2010-07-07 19:27:26 +02:00
parent e820261f29
commit efa9d5423d
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migrate/tests/fixture/shell.py
View File

@ -3,20 +3,26 @@
import os import os
import sys import sys
import logging
from scripttest import TestFileEnvironment from scripttest import TestFileEnvironment
from migrate.tests.fixture.pathed import * from migrate.tests.fixture.pathed import *
log = logging.getLogger(__name__)
class Shell(Pathed): class Shell(Pathed):
"""Base class for command line tests""" """Base class for command line tests"""
def setUp(self): def setUp(self):
super(Shell, self).setUp() super(Shell, self).setUp()
migrate_path = os.path.dirname(sys.executable)
# PATH to migrate development script folder
log.debug('PATH for ScriptTest: %s', migrate_path)
self.env = TestFileEnvironment( self.env = TestFileEnvironment(
base_path=os.path.join(self.temp_usable_dir, 'env'), base_path=os.path.join(self.temp_usable_dir, 'env'),
script_path=[os.path.dirname(sys.executable)], # PATH to migrate development script folder script_path=[migrate_path],
) )
def run_version(self, repos_path): def run_version(self, repos_path):

12
migrate/tests/versioning/test_schemadiff.py
View File

@ -7,7 +7,7 @@ from sqlalchemy import *
from nose.tools import eq_ from nose.tools import eq_
from migrate.versioning import genmodel, schemadiff from migrate.versioning import genmodel, schemadiff
from migrate.changeset import schema from migrate.changeset import schema, SQLA_06
from migrate.tests import fixture from migrate.tests import fixture
@ -100,7 +100,10 @@ class TestSchemaDiff(fixture.DB):
if not self.engine.name == 'oracle': if not self.engine.name == 'oracle':
# Add data, later we'll make sure it's still present. # Add data, later we'll make sure it's still present.
result = self.engine.execute(self.table.insert(), id=1, name=u'mydata') result = self.engine.execute(self.table.insert(), id=1, name=u'mydata')
dataId = result.inserted_primary_key[0] if SQLA_06:
dataId = result.inserted_primary_key[0]
else:
dataId = result.last_inserted_ids()[0]
# Modify table in model (by removing it and adding it back to model) -- drop column data and add column data2. # Modify table in model (by removing it and adding it back to model) -- drop column data and add column data2.
self.meta.remove(self.table) self.meta.remove(self.table)
@ -124,7 +127,10 @@ class TestSchemaDiff(fixture.DB):
# Add data, later we'll make sure it's still present. # Add data, later we'll make sure it's still present.
result = self.engine.execute(self.table.insert(), id=2, name=u'mydata2', data2=123) result = self.engine.execute(self.table.insert(), id=2, name=u'mydata2', data2=123)
dataId2 = result.last_inserted_ids()[0] if SQLA_06:
dataId2 = result.inserted_primary_key[0]
else:
dataId2 = result.last_inserted_ids()[0]
# Change column type in model. # Change column type in model.
self.meta.remove(self.table) self.meta.remove(self.table)