[SQL-CVS] r1614 - in home/phd/SQLObject/paramstyles/sqlobject: . tests

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

Author: phd
Date: 2006-02-20 08:25:08 -0700 (Mon, 20 Feb 2006)
New Revision: 1614

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/col.py
   home/phd/SQLObject/paramstyles/sqlobject/tests/test_foreignKey.py
Log:
Merged patches from the revisions 1611:1613 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/col.py	2006-02-20 15:22:14 UTC (rev 1613)
+++ home/phd/SQLObject/paramstyles/sqlobject/col.py	2006-02-20 15:25:08 UTC (rev 1614)
@@ -538,6 +538,8 @@
             return None
         if isinstance(value, unicode):
             return value
+        if isinstance(value, array_type): # MySQL
+            return unicode(value.tostring(), self.db_encoding)
         return unicode(value, self.db_encoding)
 
     def from_python(self, value, state):

Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_foreignKey.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_foreignKey.py	2006-02-20 15:22:14 UTC (rev 1613)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_foreignKey.py	2006-02-20 15:25:08 UTC (rev 1614)
@@ -38,5 +38,7 @@
     assert s[0]==w2
 
 def test2():
+    TestWorkKey._connection = getConnection()
+    InstalledTestDatabase.drop(TestWorkKey)
     setupClass([TestComposerKey, TestWorkKey2], force=True)
     TestWorkKey2.sqlmeta.addColumn(ForeignKey('TestComposerKey'), changeSchema=True)