From: Mike Bayer Date: Tue, 7 Aug 2012 20:49:02 +0000 (-0400) Subject: - more import cleanup for MSSQL X-Git-Tag: rel_0_8_0b1~282 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18ab1b8c464e6cae96f03b2d6f2680cc8cdb7afe;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - more import cleanup for MSSQL --- diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index 0a408bbc8a..668b32d143 100644 --- 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 29a9de3447..30849e0efa 100644 --- 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 15ebad1f8f..3f0c106c29 100644 --- 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 f9f2e7a48e..96b1511bd7 100644 --- 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 b3b1641e0f..616c906cd5 100644 --- 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 4bbd82c07e..38deacfd6b 100644 --- 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 0fdf573526..b254a98e85 100644 --- 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):