Author: phd
Date: 2006-09-06 08:49:00 -0600 (Wed, 06 Sep 2006)
New Revision: 1910
Modified:
home/phd/SQLObject/paramstyles/sqlobject/main.py
Log:
Merged patches from the revisions 1907:1909 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-09-06 14:47:06 UTC (rev 1909)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-09-06 14:49:00 UTC (rev 1910)
@@ -1280,10 +1280,9 @@
def _findAlternateID(cls, name, dbName, value, connection=None):
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
+ column = cls.sqlmeta.columns[name]
+ if isinstance(column, col.SOUnicodeCol):
+ value = value.encode(column.dbEncoding)
return (connection or cls._connection)._SO_selectOneAlt(
cls,
[cls.sqlmeta.idName] +
|
