[SQL-CVS] r1425 - SQLObject/trunk/sqlobject

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

Author: phd
Date: 2005-12-16 13:56:56 +0000 (Fri, 16 Dec 2005)
New Revision: 1425

Modified:
   SQLObject/trunk/sqlobject/main.py
Log:
A patch by Yuan HOng <hon...@gm...> -
.get() updates the object using passed selectResults.


Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2005-12-15 16:56:09 UTC (rev 1424)
+++ SQLObject/trunk/sqlobject/main.py	2005-12-16 13:56:56 UTC (rev 1425)
@@ -960,6 +960,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)