[SQL-CVS] r1816 - in home/phd/SQLObject/paramstyles/sqlobject: mysql postgres

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

Author: phd
Date: 2006-06-15 10:42:53 -0600 (Thu, 15 Jun 2006)
New Revision: 1816

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py
Log:
Merged patches from the revisions 1813:1815 from the trunk: a patch by Ivan Horvath <i.h...@al...> for use_unicode with fromDatabase.

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2006-06-15 16:41:48 UTC (rev 1815)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2006-06-15 16:42:53 UTC (rev 1816)
@@ -145,6 +145,9 @@
             if field == 'id':
                 continue
             colClass, kw = self.guessClass(t)
+            if self.kw['use_unicode'] and colClass is col.StringCol:
+                colClass = col.UnicodeCol
+                if self.client_encoding: kw['dbEncoding'] = self.client_encoding
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
             kw['notNone'] = not nullAllowed
             if default and t.startswith('int'):
@@ -180,18 +183,18 @@
         elif t.startswith('tinyblob'):
             return col.BLOBCol, {"length": 2**8-1}
         elif t.startswith('tinytext'):
-            return col.BLOBCol, {"length": 2**8-1, "varchar": True}
+            return col.StringCol, {"length": 2**8-1, "varchar": True}
         elif t.startswith('blob'):
             return col.BLOBCol, {"length": 2**16-1}
         elif t.startswith('text'):
-            return col.BLOBCol, {"length": 2**16-1, "varchar": True}
+            return col.StringCol, {"length": 2**16-1, "varchar": True}
         elif t.startswith('mediumblob'):
             return col.BLOBCol, {"length": 2**24-1}
         elif t.startswith('mediumtext'):
-            return col.BLOBCol, {"length": 2**24-1, "varchar": True}
+            return col.StringCol, {"length": 2**24-1, "varchar": True}
         elif t.startswith('longblob'):
             return col.BLOBCol, {"length": 2**32}
         elif t.startswith('longtext'):
-            return col.BLOBCol, {"length": 2**32, "varchar": True}
+            return col.StringCol, {"length": 2**32, "varchar": True}
         else:
             return col.Col, {}

Modified: home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py	2006-06-15 16:41:48 UTC (rev 1815)
+++ home/phd/SQLObject/paramstyles/sqlobject/postgres/pgconnection.py	2006-06-15 16:42:53 UTC (rev 1816)
@@ -238,7 +238,7 @@
             if field == primaryKey:
                 continue
             colClass, kw = self.guessClass(t)
-            if self.unicodeCols and colClass == col.StringCol:
+            if self.unicodeCols and colClass is col.StringCol:
                 colClass = col.UnicodeCol
                 kw['dbEncoding'] = client_encoding
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
@@ -327,7 +327,6 @@
         conn.close()
 
 
-
 # Converter for psycopg Binary type.
 def PsycoBinaryConverter(value, db):
     assert db == 'postgres'