From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 5 Jul 2009 23:41:43 +0000 (+0000)
Subject: use NVARCHAR/NTEXT for unicode...
X-Git-Tag: rel_0_6_6~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7719847501c15441df8f3e2960b2c43c904b1eb6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

use NVARCHAR/NTEXT for unicode...
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 5dade1515a..a5fdae2b73 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -674,18 +674,12 @@ class MSTypeCompiler(compiler.GenericTypeCompiler):
     def visit_SMALLDATETIME(self, type_):
         return "SMALLDATETIME"
 
-    def visit_string(self, type_):
-        if type_.convert_unicode:
-            return self._extend("NVARCHAR", type_)
-        else:
-            return self._extend("VARCHAR", type_)
-
-    def visit_text(self, type_):
-        if type_.convert_unicode:
-            return self._extend("NTEXT", type_)
-        else:
-            return self._extend("TEXT", type_)
-
+    def visit_unicode(self, type_):
+        return self.visit_NVARCHAR(type_)
+        
+    def visit_unicode_text(self, type_):
+        return self.visit_NTEXT(type_)
+        
     def visit_NTEXT(self, type_):
         return self._extend("NTEXT", type_)
 
@@ -824,18 +818,11 @@ class MSExecutionContext(default.DefaultExecutionContext):
 
 
 colspecs = {
-    sqltypes.Unicode : MSNVarchar,
     sqltypes.Numeric : MSNumeric,
     sqltypes.DateTime : MSDateTime,
     sqltypes.Date : MSDate,
     sqltypes.Time : MSTime,
-    sqltypes.String : MSString,
     sqltypes.Boolean : MSBoolean,
-    sqltypes.Text : MSText,
-    sqltypes.UnicodeText : MSNText,
-    sqltypes.CHAR: MSChar,
-    sqltypes.NCHAR: MSNChar,
-    MSSmallDateTime: MSSmallDateTime,
 }
 
 ischema_names = {