summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/mssql/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-07 14:55:41 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-07 14:55:41 -0400
commitc13d4f613faa0590db713c4491781012163bc5f0 (patch)
tree508800c1349bb8c8ada92a93b44432f5ca4cc0b3 /lib/sqlalchemy/dialects/mssql/base.py
parent5a02c9e73fe7e4bcafa6c07bce29131eefb5a022 (diff)
downloadsqlalchemy-c13d4f613faa0590db713c4491781012163bc5f0.tar.gz
- fixes
Diffstat (limited to 'lib/sqlalchemy/dialects/mssql/base.py')
-rw-r--r--lib/sqlalchemy/dialects/mssql/base.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index e38aa8c1e..5776e83bc 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -172,7 +172,8 @@ from sqlalchemy import sql, schema as sa_schema, exc, util
from sqlalchemy.sql import select, compiler, expression, \
operators as sql_operators, \
util as sql_util, cast
-from sqlalchemy.engine import default, base, reflection
+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, \
FLOAT, TIMESTAMP, DATETIME, DATE, BINARY,\
@@ -367,11 +368,11 @@ class VARCHAR(_StringType, sqltypes.VARCHAR):
database into ``unicode``.
Bytestrings are encoded using the dialect's
- :attr:`~sqlalchemy.engine.base.Dialect.encoding`, which
+ :attr:`~sqlalchemy.engine.Dialect.encoding`, which
defaults to `utf-8`.
If False, may be overridden by
- :attr:`sqlalchemy.engine.base.Dialect.convert_unicode`.
+ :attr:`sqlalchemy.engine.Dialect.convert_unicode`.
:param collation: Optional, a column-level collation for this string
value. Accepts a Windows Collation Name or a SQL Collation Name.
@@ -412,11 +413,11 @@ class CHAR(_StringType, sqltypes.CHAR):
database into ``unicode``.
Bytestrings are encoded using the dialect's
- :attr:`~sqlalchemy.engine.base.Dialect.encoding`, which
+ :attr:`~sqlalchemy.engine.Dialect.encoding`, which
defaults to `utf-8`.
If False, may be overridden by
- :attr:`sqlalchemy.engine.base.Dialect.convert_unicode`.
+ :attr:`sqlalchemy.engine.Dialect.convert_unicode`.
:param collation: Optional, a column-level collation for this string
value. Accepts a Windows Collation Name or a SQL Collation Name.
@@ -716,7 +717,7 @@ class MSExecutionContext(default.DefaultExecutionContext):
if self._result_proxy:
return self._result_proxy
else:
- return base.ResultProxy(self)
+ return engine.ResultProxy(self)
class MSSQLCompiler(compiler.SQLCompiler):
returning_precedes_values = True