[SQL-CVS] r1903 - in home/phd/SQLObject/paramstyles/sqlobject: . inheritance/tests

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

Author: phd
Date: 2006-09-05 08:07:44 -0600 (Tue, 05 Sep 2006)
New Revision: 1903

Added:
   home/phd/SQLObject/paramstyles/sqlobject/inheritance/tests/testDestroyCascade.py
Modified:
   home/phd/SQLObject/paramstyles/sqlobject/main.py
Log:
Merged patches from the revisions 1900:1902 from the trunk

Copied: home/phd/SQLObject/paramstyles/sqlobject/inheritance/tests/testDestroyCascade.py (from rev 1902, SQLObject/trunk/sqlobject/inheritance/tests/testDestroyCascade.py)
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/inheritance/tests/testDestroyCascade.py	                        (rev 0)
+++ home/phd/SQLObject/paramstyles/sqlobject/inheritance/tests/testDestroyCascade.py	2006-09-05 14:07:44 UTC (rev 1903)
@@ -0,0 +1,20 @@
+from sqlobject import *
+from sqlobject.inheritance import *
+from sqlobject.tests.dbtest import *
+
+class TestCascade1(InheritableSQLObject):
+    dummy = IntCol()
+
+class TestCascade2(TestCascade1):
+    c = ForeignKey('TestCascade3', cascade='null')
+
+class TestCascade3(SQLObject):
+    dummy = IntCol()
+
+
+def test_destroySelf():
+    setupClass([TestCascade1, TestCascade3, TestCascade2])
+
+    c = TestCascade3(dummy=1)
+    b = TestCascade2(cID=c.id, dummy=1)
+    c.destroySelf()

Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-09-05 13:49:58 UTC (rev 1902)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py	2006-09-05 14:07:44 UTC (rev 1903)
@@ -1498,7 +1498,7 @@
                 if col.cascade == False:
                     # Found a restriction
                     restrict = True
-                query.append("%s = (%s)" % (col.dbName, self.id))
+                query.append(getattr(k.q, col.name) == self.id)
                 if col.cascade == 'null':
                     setnull = col.name
                 elif col.cascade:
@@ -1507,7 +1507,7 @@
                 "Class %s depends on %s accoriding to "
                 "findDependantColumns, but this seems inaccurate"
                 % (k, klass))
-            query = ' OR '.join(query)
+            query = sqlbuilder.OR(*query)
             results = k.select(query, connection=self._connection)
             if restrict:
                 if results.count():