PublicArchive/sqlalchemy
2
0
Fork 0
mirror of https://github.com/sqlalchemy/sqlalchemy.git synced 2026-06-03 22:35:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up the dialect selection thing here

Browse Source
This commit is contained in:
Mike Bayer
2013-06-04 18:49:24 -04:00
parent c7b52003fb
commit ff2266bfac
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sqlalchemy/testing/assertions.py
+12 -8
View File
@@ -184,15 +184,19 @@ class AssertsCompiledSQL(object):
allow_dialect_select=False):
if use_default_dialect:
dialect = default.DefaultDialect()
elif dialect == None and not allow_dialect_select:
dialect = getattr(self, '__dialect__', None)
elif allow_dialect_select:
dialect = None
else:
if dialect is None:
dialect = getattr(self, '__dialect__', None)
if dialect is None:
dialect = config.db.dialect
elif dialect == 'default':
dialect = default.DefaultDialect()
elif isinstance(dialect, util.string_types):
dialect = create_engine("%s://" % dialect).dialect
if dialect == 'default':
dialect = default.DefaultDialect()
elif dialect is None:
dialect = config.db.dialect
elif isinstance(dialect, util.string_types):
dialect = create_engine("%s://" % dialect).dialect
kw = {}
if params is not None: