From 437f1ce670e84964dc701488ac09af565ba807f7 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 14 Jan 2007 20:21:36 +0000 Subject: - postgres cursor option is now server_side_cursors=False; some users get bad results using them so theyre off by default - type system slightly modified to support TypeDecorators that can be overridden by the dialect - added an NVarchar type to mssql (produces NVARCHAR), also MSUnicode which provides Unicode-translation for the NVarchar regardless of dialect convert_unicode setting. --- lib/sqlalchemy/databases/mssql.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/sqlalchemy/databases/mssql.py') diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 2028ab48f..6d351d0fb 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -146,9 +146,13 @@ class MSText(sqltypes.TEXT): class MSString(sqltypes.String): def get_col_spec(self): return "VARCHAR(%(length)s)" % {'length' : self.length} -class MSUnicode(sqltypes.Unicode): +class MSNVarchar(MSString): + """NVARCHAR string, does unicode conversion if dialect.convert_encoding is true""" def get_col_spec(self): return "NVARCHAR(%(length)s)" % {'length' : self.length} +class MSUnicode(sqltypes.Unicode): + """Unicode subclass, does unicode conversion in all cases, uses NVARCHAR impl""" + impl = MSNVarchar class MSChar(sqltypes.CHAR): def get_col_spec(self): return "CHAR(%(length)s)" % {'length' : self.length} @@ -259,8 +263,6 @@ class MSSQLExecutionContext(default.DefaultExecutionContext): self.HASIDENT = False - - class MSSQLDialect(ansisql.ANSIDialect): def __init__(self, module=None, auto_identity_insert=False, **params): self.module = module or dbmodule @@ -546,7 +548,7 @@ class MSSQLCompiler(ansisql.ANSICompiler): class MSSQLSchemaGenerator(ansisql.ANSISchemaGenerator): def get_column_specification(self, column, **kwargs): colspec = self.preparer.format_column(column) + " " + column.type.engine_impl(self.engine).get_col_spec() - + # install a IDENTITY Sequence if we have an implicit IDENTITY column if column.primary_key and column.autoincrement and isinstance(column.type, sqltypes.Integer) and not column.foreign_key: if column.default is None or (isinstance(column.default, schema.Sequence) and column.default.optional): @@ -583,7 +585,7 @@ class MSSQLIdentifierPreparer(ansisql.ANSIIdentifierPreparer): #TODO: determin MSSQL's case folding rules return value -if dbmodule.__name__ == 'adodbapi': +if dbmodule and dbmodule.__name__ == 'adodbapi': dialect = MSSQLDialect else: dialect = PyMSSQLDialect -- cgit v1.2.1