- more import cleanup for MSSQL

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 0a408bbc8a0b02b8e75edf92407df539840fdddc..668b32d14373b6f21ede3691c29942f032d03b35 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -166,21 +166,21 @@ Known Issues
   SQL Server 2005
 
 """
-import datetime, operator, re
+import datetime
+import operator
+import re
 
-from sqlalchemy import sql, schema as sa_schema, exc, util
-from sqlalchemy.sql import select, compiler, expression, \
-                            operators as sql_operators, \
+from ... import sql, schema as sa_schema, exc, util
+from ...sql import compiler, expression, \
                             util as sql_util, cast
-from sqlalchemy import engine
-from sqlalchemy.engine import reflection, default
-from sqlalchemy import types as sqltypes
-from sqlalchemy.types import INTEGER, BIGINT, SMALLINT, DECIMAL, NUMERIC, \
+from ... import engine
+from ...engine import reflection, default
+from ... import types as sqltypes
+from ...types import INTEGER, BIGINT, SMALLINT, DECIMAL, NUMERIC, \
                                 FLOAT, TIMESTAMP, DATETIME, DATE, BINARY,\
-                                VARBINARY, BLOB
+                                VARBINARY
 
-
-from sqlalchemy.dialects.mssql import information_schema as ischema
+from . import information_schema as ischema
 
 MS_2008_VERSION = (10,)
 MS_2005_VERSION = (9,)

diff --git a/lib/sqlalchemy/dialects/mssql/information_schema.py b/lib/sqlalchemy/dialects/mssql/information_schema.py
index 29a9de3447893d043a6957fb7245cd32f66b54ac..30849e0efa6099c96f004d93a5c89cfea5e47307 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/information_schema.py
+++ b/lib/sqlalchemy/dialects/mssql/information_schema.py
@@ -6,8 +6,8 @@
 
 # TODO: should be using the sys. catalog with SQL Server, not information schema
 
-from sqlalchemy import Table, MetaData, Column
-from sqlalchemy.types import String, Unicode, Integer, TypeDecorator
+from ... import Table, MetaData, Column
+from ...types import String, Unicode, Integer, TypeDecorator
 
 ischema = MetaData()
 

diff --git a/lib/sqlalchemy/dialects/mssql/mxodbc.py b/lib/sqlalchemy/dialects/mssql/mxodbc.py
index 15ebad1f8f76319e4ead2cc9df520c59771cba66..3f0c106c295385a06be61fdbd497740100cbcbfc 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/mxodbc.py
+++ b/lib/sqlalchemy/dialects/mssql/mxodbc.py
@@ -52,10 +52,10 @@ of ``False`` will unconditionally use string-escaped parameters.
 """
 
 
-from sqlalchemy import types as sqltypes
-from sqlalchemy.connectors.mxodbc import MxODBCConnector
-from sqlalchemy.dialects.mssql.pyodbc import MSExecutionContext_pyodbc
-from sqlalchemy.dialects.mssql.base import (MSDialect,
+from ... import types as sqltypes
+from ...connectors.mxodbc import MxODBCConnector
+from .pyodbc import MSExecutionContext_pyodbc
+from .base import (MSDialect,
                                             MSSQLStrictCompiler,
                                             _MSDateTime, _MSDate, TIME)
 

diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py
index f9f2e7a48e9396f2b1f469a90a945a5a4838fa59..96b1511bd7d55303edf7f77f67b781139de450d0 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/pymssql.py
+++ b/lib/sqlalchemy/dialects/mssql/pymssql.py
@@ -38,8 +38,8 @@ pymssql inherits a lot of limitations from FreeTDS, including:
 Please consult the pymssql documentation for further information.
 
 """
-from sqlalchemy.dialects.mssql.base import MSDialect
-from sqlalchemy import types as sqltypes, util, processors
+from .base import MSDialect
+from ... import types as sqltypes, util, processors
 import re
 
 class _MSNumeric_pymssql(sqltypes.Numeric):

diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py
index b3b1641e0f861b66b12cfa43c1a03b065590f440..616c906cd517e01f8f82815707fc99e524965c99 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/pyodbc.py
+++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py
@@ -111,10 +111,10 @@ for unix + PyODBC.
 
 """
 
-from sqlalchemy.dialects.mssql.base import MSExecutionContext, MSDialect
-from sqlalchemy.connectors.pyodbc import PyODBCConnector
-from sqlalchemy import types as sqltypes, util
-import decimal
+from .base import MSExecutionContext, MSDialect
+from ...connectors.pyodbc import PyODBCConnector
+from ... import types as sqltypes, util
+from ...util.compat import decimal
 
 class _MSNumeric_pyodbc(sqltypes.Numeric):
     """Turns Decimals with adjusted() < 0 or > 7 into strings.

diff --git a/lib/sqlalchemy/dialects/mssql/zxjdbc.py b/lib/sqlalchemy/dialects/mssql/zxjdbc.py
index 4bbd82c07e2e8b379c9618aa46d123daab5bfdbe..38deacfd6bf78d6b437b5a0366f5f8731ffbc302 100644 (file)
--- a/lib/sqlalchemy/dialects/mssql/zxjdbc.py
+++ b/lib/sqlalchemy/dialects/mssql/zxjdbc.py
@@ -24,9 +24,9 @@ arguments on the URL, or as keyword arguments to
 properties to the underlying JDBC driver.
 
 """
-from sqlalchemy.connectors.zxJDBC import ZxJDBCConnector
-from sqlalchemy.dialects.mssql.base import MSDialect, MSExecutionContext
-from sqlalchemy.engine import base
+from ...connectors.zxJDBC import ZxJDBCConnector
+from .base import MSDialect, MSExecutionContext
+from ... import engine
 
 class MSExecutionContext_zxjdbc(MSExecutionContext):
 
@@ -46,13 +46,13 @@ class MSExecutionContext_zxjdbc(MSExecutionContext):
                 try:
                     row = self.cursor.fetchall()[0]
                     break
-                except self.dialect.dbapi.Error, e:
+                except self.dialect.dbapi.Error:
                     self.cursor.nextset()
             self._lastrowid = int(row[0])
 
         if (self.isinsert or self.isupdate or self.isdelete) and \
             self.compiled.returning:
-            self._result_proxy = base.FullyBufferedResultProxy(self)
+            self._result_proxy = engine.FullyBufferedResultProxy(self)
 
         if self._enable_identity_insert:
             table = self.dialect.identifier_preparer.format_table(

diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py
index 0fdf5735266c711bbac390900d591d418d0b0b1a..b254a98e857c0b7ccfb71cb1131656ee1b754287 100644 (file)
--- a/test/dialect/test_mssql.py
+++ b/test/dialect/test_mssql.py
@@ -513,7 +513,8 @@ class SchemaAliasingTest(fixtures.TestBase, AssertsCompiledSQL):
         t1, t2 = self.t1, self.t2
         self.assert_compile(
             t1.join(t2, t1.c.a==t2.c.a).select(),
-            "SELECT t1.a, t1.b, t1.c, t2_1.a, t2_1.b, t2_1.c FROM t1 JOIN [schema].t2 AS t2_1 ON t2_1.a = t1.a"
+            "SELECT t1.a, t1.b, t1.c, t2_1.a, t2_1.b, t2_1.c FROM t1 "
+            "JOIN [schema].t2 AS t2_1 ON t2_1.a = t1.a"
         )
 
     def test_union_schema_to_non(self):