[SQL-CVS] r3456 - in SQLObject/trunk: docs sqlobject sqlobject/mssql

[<sub...@co...>]

Author: phd
Date: 2008-05-21 08:54:05 -0600 (Wed, 21 May 2008)
New Revision: 3456

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/col.py
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
Log:
Use VARCHAR(MAX) and VARBINARY(MAX) for MSSQL >= 9.0.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2008-05-21 14:53:32 UTC (rev 3455)
+++ SQLObject/trunk/docs/News.txt	2008-05-21 14:54:05 UTC (rev 3456)
@@ -117,6 +117,8 @@
 SQLObject 0.9.7
 ===============
 
+* Use VARCHAR(MAX) and VARBINARY(MAX) for MSSQL >= 9.0.
+
 * Fixed a minor bug in Set column.
 
 * A bug fixed for RowCreatedSignal together with InheritableSQLObject:

Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2008-05-21 14:53:32 UTC (rev 3455)
+++ SQLObject/trunk/sqlobject/col.py	2008-05-21 14:54:05 UTC (rev 3456)
@@ -333,7 +333,8 @@
     def sybaseCreateSQL(self):
         return ' '.join([self.dbName, self._sybaseType()] + self._extraSQL())
 
-    def mssqlCreateSQL(self):
+    def mssqlCreateSQL(self, connection=None):
+        self.connection = connection
         return ' '.join([self.dbName, self._mssqlType()] + self._extraSQL())
 
     def firebirdCreateSQL(self):
@@ -478,7 +479,10 @@
         if self.customSQLType is not None:
             return self.customSQLType
         if not self.length:
-            type = 'varchar(4000)'
+            if self.connection and self.connection.can_use_max_types:
+                type = 'VARCHAR(MAX)'
+            else:
+                type = 'varchar(4000)'
         elif self.varchar:
             type = 'VARCHAR(%i)' % self.length
         else:
@@ -868,8 +872,8 @@
         # @@: Code from above should be moved here
         return None
 
-    def mssqlCreateSQL(self):
-        sql = SOKeyCol.mssqlCreateSQL(self)
+    def mssqlCreateSQL(self, connection=None):
+        sql = SOKeyCol.mssqlCreateSQL(self, connection)
         other = findClass(self.foreignKey, self.soClass.sqlmeta.registry)
         tName = other.sqlmeta.table
         idName = other.sqlmeta.idName
@@ -1402,7 +1406,10 @@
         return 'BYTEA'
 
     def _mssqlType(self):
-        return "IMAGE"
+        if self.connection and self.connection.can_use_max_types:
+            return 'VARBINARY(MAX)'
+        else:
+            return "IMAGE"
 
 class BLOBCol(StringCol):
     baseClass = SOBLOBCol

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	2008-05-21 14:53:32 UTC (rev 3455)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	2008-05-21 14:54:05 UTC (rev 3456)
@@ -158,7 +158,7 @@
         return col.mssqlCreateReferenceConstraint()
 
     def createColumn(self, soClass, col):
-        return col.mssqlCreateSQL()
+        return col.mssqlCreateSQL(self)
 
     def createIDColumn(self, soClass):
         key_type = {int: "INT", str: "TEXT"}[soClass.sqlmeta.idType]
@@ -180,7 +180,7 @@
     def addColumn(self, tableName, column):
         self.query('ALTER TABLE %s ADD %s' %
                    (tableName,
-                    column.mssqlCreateSQL()))
+                    column.mssqlCreateSQL(self)))
 
     def delColumn(self, sqlmeta, column):
         self.query('ALTER TABLE %s DROP COLUMN %s' % (tableName.table, column.dbName))
@@ -276,3 +276,21 @@
                                    'precision': scale}
         else:
             return col.Col, {}
+
+    @property
+    def server_version(self):
+        try:
+            server_version = self.queryAll("SELECT SERVERPROPERTY('productversion')")[0][0]
+            server_version = server_version.split('.')[0]
+            server_version = int(server_version)
+        except:
+            server_version = None # unknown
+        self.server_version = server_version # cache it forever
+        return server_version
+
+    @property
+    def can_use_max_types(self):
+        server_version = self.server_version
+        self.can_use_max_types = can_use_max_types = \
+            (server_version is not None) and (server_version >= 9)
+        return can_use_max_types