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

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

Author: phd
Date: 2006-01-03 11:57:07 +0000 (Tue, 03 Jan 2006)
New Revision: 1452

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

Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-01-03 11:42:17 UTC (rev 1451)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-01-03 11:57:07 UTC (rev 1452)
@@ -546,6 +546,10 @@
     def delJoin(sqlmeta, joinDef):
         soClass = sqlmeta.soClass
         for join in sqlmeta.joins:
+            # previously deleted joins will be None, so it must
+            # be skipped or it'll error out on the next line.
+            if join is None:
+                continue
             if joinDef is join.joinDef:
                 break
         else: