[SQL-CVS] r1906 - home/phd/SQLObject/paramstyles/sqlobject

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

Author: phd
Date: 2006-09-05 09:24:45 -0600 (Tue, 05 Sep 2006)
New Revision: 1906

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/main.py
Log:
Merged patches from the revisions 1903:1905 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-09-05 15:24:05 UTC (rev 1905)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-09-05 15:24:45 UTC (rev 1906)
@@ -1279,10 +1279,11 @@
         return getID(obj)
 
     def _findAlternateID(cls, name, dbName, value, connection=None):
-        for key, column in cls.sqlmeta.columns.items():
-            if (key == name) and isinstance(column, col.SOUnicodeCol):
-                if isinstance(value, unicode):
+        if isinstance(value, unicode):
+            for key, column in cls.sqlmeta.columns.items():
+                if (key == name) and isinstance(column, col.SOUnicodeCol):
                     value = value.encode(column.dbEncoding)
+                    break
         return (connection or cls._connection)._SO_selectOneAlt(
             cls,
             [cls.sqlmeta.idName] +