[SQL-CVS] r1426 - SQLObject/branches/0.7-bugfix/sqlobject

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

Author: phd
Date: 2005-12-16 13:58:11 +0000 (Fri, 16 Dec 2005)
New Revision: 1426

Modified:
   SQLObject/branches/0.7-bugfix/sqlobject/main.py
Log:
Merged the rev. 1425 from the trunk: a patch by Yuan HOng <hon...@gm...> -
.get() updates the object using passed selectResults.


Modified: SQLObject/branches/0.7-bugfix/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/main.py	2005-12-16 13:56:56 UTC (rev 1425)
+++ SQLObject/branches/0.7-bugfix/sqlobject/main.py	2005-12-16 13:58:11 UTC (rev 1426)
@@ -909,6 +909,13 @@
                 cache.put(id, cls, val)
             finally:
                 cache.finishPut(cls)
+        elif selectResults and not val.dirty:
+            val._SO_writeLock.acquire()
+            try:
+                val._SO_selectInit(selectResults)
+                val.sqlmeta.expired = False
+            finally:
+                val._SO_writeLock.release()
         return val
 
     get = classmethod(get)