From: Michael Trier <mtrier@gmail.com>
Date: Tue, 20 Jan 2009 03:39:40 +0000 (+0000)
Subject: A couple of fixes for the mssql dialect to correct restructuring / renaming.
X-Git-Tag: rel_0_6_6~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ae0f3fb008fe7c613a95ff18c768e143d848f0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

A couple of fixes for the mssql dialect to correct restructuring / renaming.
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 12aceef072..7b6d619ea1 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -1104,7 +1104,7 @@ class MSDialect(default.DefaultDialect):
         return self.schema_name
 
     def table_names(self, connection, schema):
-        from sqlalchemy.databases import information_schema as ischema
+        from sqlalchemy.dialects import information_schema as ischema
         return ischema.table_names(connection, schema)
 
     def uppercase_table(self, t):
@@ -1118,7 +1118,7 @@ class MSDialect(default.DefaultDialect):
 
 
     def has_table(self, connection, tablename, schema=None):
-        import sqlalchemy.databases.information_schema as ischema
+        import sqlalchemy.dialects.information_schema as ischema
 
         current_schema = schema or self.get_default_schema_name(connection)
         columns = self.uppercase_table(ischema.columns)
@@ -1133,7 +1133,7 @@ class MSDialect(default.DefaultDialect):
         return row is not None
 
     def reflecttable(self, connection, table, include_columns):
-        import sqlalchemy.databases.information_schema as ischema
+        import sqlalchemy.dialects.information_schema as ischema
         # Get base columns
         if table.schema is not None:
             current_schema = table.schema
diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py
index 3c18f60e75..55691e7b05 100644
--- a/lib/sqlalchemy/dialects/mssql/pyodbc.py
+++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py
@@ -7,7 +7,7 @@ import sys
 class MSExecutionContext_pyodbc(MSExecutionContext):
     def pre_exec(self):
         """where appropriate, issue "select scope_identity()" in the same statement"""
-        super(MSSQLExecutionContext_pyodbc, self).pre_exec()
+        super(MSExecutionContext_pyodbc, self).pre_exec()
         if self.compiled.isinsert and self.HASIDENT and not self.IINSERT \
                 and len(self.parameters) == 1 and self.dialect.use_scope_identity:
             self.statement += "; select scope_identity()"
@@ -25,7 +25,7 @@ class MSExecutionContext_pyodbc(MSExecutionContext):
                     self.cursor.nextset()
             self._last_inserted_ids = [int(row[0])]
         else:
-            super(MSSQLExecutionContext_pyodbc, self).post_exec()
+            super(MSExecutionContext_pyodbc, self).post_exec()
 
 
 class MSDialect_pyodbc(PyODBCConnector, MSDialect):
@@ -56,4 +56,4 @@ class MSDialect_pyodbc(PyODBCConnector, MSDialect):
         else:
             return False
 
-dialect = MSDialect_pyodbc
\ No newline at end of file
+dialect = MSDialect_pyodbc