From: Mike Bayer Date: Thu, 31 Aug 2017 02:32:50 +0000 (-0400) Subject: set native boolean to false on the dialect for the schematype tests X-Git-Tag: rel_0_9_6~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a6e65544637a29131c90a6f9e957b1de971f574;p=thirdparty%2Fsqlalchemy%2Falembic.git set native boolean to false on the dialect for the schematype tests mssql in 1.2 now does native boolean by default which is not what this test looks for Change-Id: I26a21195efaad3bcce6cc09fd98a6d3ce6e9a029 --- diff --git a/alembic/testing/assertions.py b/alembic/testing/assertions.py index b64725ce..4fb43a4f 100644 --- a/alembic/testing/assertions.py +++ b/alembic/testing/assertions.py @@ -78,7 +78,7 @@ def assert_compiled(element, assert_string, dialect=None): ) -_dialects = {} +_dialect_mods = {} def _get_dialect(name): @@ -86,16 +86,17 @@ def _get_dialect(name): return default.DefaultDialect() else: try: - return _dialects[name] + dialect_mod = _dialect_mods[name] except KeyError: dialect_mod = getattr( __import__('sqlalchemy.dialects.%s' % name).dialects, name) - _dialects[name] = d = dialect_mod.dialect() - if name == 'postgresql': - d.implicit_returning = True - elif name == 'mssql': - d.legacy_schema_aliasing = False - return d + _dialect_mods[name] = dialect_mod + d = dialect_mod.dialect() + if name == 'postgresql': + d.implicit_returning = True + elif name == 'mssql': + d.legacy_schema_aliasing = False + return d def expect_warnings(*messages, **kw): diff --git a/alembic/testing/fixtures.py b/alembic/testing/fixtures.py index 7e05525d..b13edaeb 100644 --- a/alembic/testing/fixtures.py +++ b/alembic/testing/fixtures.py @@ -89,7 +89,8 @@ def capture_context_buffer(**kw): def op_fixture( dialect='default', as_sql=False, - naming_convention=None, literal_binds=False): + naming_convention=None, literal_binds=False, + native_boolean=None): opts = {} if naming_convention: @@ -143,6 +144,8 @@ def op_fixture( if literal_binds: opts['literal_binds'] = literal_binds ctx_dialect = _get_dialect(dialect) + if native_boolean is not None: + ctx_dialect.supports_native_boolean = native_boolean if not as_sql: def execute(stmt, *multiparam, **param): if isinstance(stmt, string_types): diff --git a/tests/test_op.py b/tests/test_op.py index 0c0608a2..68279bd6 100644 --- a/tests/test_op.py +++ b/tests/test_op.py @@ -340,7 +340,7 @@ class OpTest(TestBase): ) def test_alter_column_schema_type_unnamed(self): - context = op_fixture('mssql') + context = op_fixture('mssql', native_boolean=False) op.alter_column("t", "c", type_=Boolean()) context.assert_( 'ALTER TABLE t ALTER COLUMN c BIT', @@ -348,7 +348,7 @@ class OpTest(TestBase): ) def test_alter_column_schema_schema_type_unnamed(self): - context = op_fixture('mssql') + context = op_fixture('mssql', native_boolean=False) op.alter_column("t", "c", type_=Boolean(), schema='foo') context.assert_( 'ALTER TABLE foo.t ALTER COLUMN c BIT', @@ -356,7 +356,7 @@ class OpTest(TestBase): ) def test_alter_column_schema_type_named(self): - context = op_fixture('mssql') + context = op_fixture('mssql', native_boolean=False) op.alter_column("t", "c", type_=Boolean(name="xyz")) context.assert_( 'ALTER TABLE t ALTER COLUMN c BIT', @@ -364,7 +364,7 @@ class OpTest(TestBase): ) def test_alter_column_schema_schema_type_named(self): - context = op_fixture('mssql') + context = op_fixture('mssql', native_boolean=False) op.alter_column("t", "c", type_=Boolean(name="xyz"), schema='foo') context.assert_( 'ALTER TABLE foo.t ALTER COLUMN c BIT', @@ -372,7 +372,7 @@ class OpTest(TestBase): ) def test_alter_column_schema_type_existing_type(self): - context = op_fixture('mssql') + context = op_fixture('mssql', native_boolean=False) op.alter_column( "t", "c", type_=String(10), existing_type=Boolean(name="xyz")) context.assert_( @@ -381,7 +381,7 @@ class OpTest(TestBase): ) def test_alter_column_schema_schema_type_existing_type(self): - context = op_fixture('mssql') + context = op_fixture('mssql', native_boolean=False) op.alter_column("t", "c", type_=String(10), existing_type=Boolean(name="xyz"), schema='foo') context.assert_(