[SQL-CVS] r2238 - in SQLObject/branches/0.7-bugfix: docs sqlobject sqlobject/inheritance/tests

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

Author: phd
Date: 2007-01-23 10:13:55 -0700 (Tue, 23 Jan 2007)
New Revision: 2238

Added:
   SQLObject/branches/0.7-bugfix/sqlobject/inheritance/tests/test_inheritance_tree.py
Modified:
   SQLObject/branches/0.7-bugfix/docs/News.txt
   SQLObject/branches/0.7-bugfix/sqlobject/main.py
Log:
Fixed a bug in deep Inheritance tree (ticket:288).


Modified: SQLObject/branches/0.7-bugfix/docs/News.txt
===================================================================
--- SQLObject/branches/0.7-bugfix/docs/News.txt	2007-01-23 17:11:12 UTC (rev 2237)
+++ SQLObject/branches/0.7-bugfix/docs/News.txt	2007-01-23 17:13:55 UTC (rev 2238)
@@ -26,6 +26,8 @@
 
 * Remove a leading slash in FirebirdConnection.
 
+* Fixed a bug in deep Inheritance tree.
+
 SQLObject 0.7.2
 ===============
 

Added: SQLObject/branches/0.7-bugfix/sqlobject/inheritance/tests/test_inheritance_tree.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/inheritance/tests/test_inheritance_tree.py	                        (rev 0)
+++ SQLObject/branches/0.7-bugfix/sqlobject/inheritance/tests/test_inheritance_tree.py	2007-01-23 17:13:55 UTC (rev 2238)
@@ -0,0 +1,37 @@
+from sqlobject import *
+from sqlobject.inheritance import *
+from sqlobject.tests.dbtest import *
+
+########################################
+## Inheritance Tree
+########################################
+
+class Tree1(InheritableSQLObject):
+    aprop = StringCol(length=10)
+
+class Tree2(Tree1):
+    bprop = StringCol(length=10)
+
+class Tree3(Tree1):
+    cprop = StringCol(length=10)
+
+class Tree4(Tree2):
+    dprop = StringCol(length=10)
+
+class Tree5(Tree2):
+    eprop = StringCol(length=10)
+
+def test_tree():
+    setupClass([Tree1, Tree2, Tree3, Tree4, Tree5])
+
+    t1 = Tree1(aprop='t1')
+    t2 = Tree2(aprop='t2', bprop='t2')
+    t3 = Tree3(aprop='t3', cprop='t3')
+    t4 = Tree4(aprop='t4', bprop='t4', dprop='t4')
+    t5 = Tree5(aprop='t5', bprop='t5', eprop='t5')
+
+    # find just the t5 out of childs from Tree2
+    assert t5 == Tree1.select(Tree2.q.childName == 'Tree5')[0]
+
+    # t2,t4,t5 are all subclasses of Tree1 with t1 childName of 'Tree2'
+    assert list(Tree1.select(Tree1.q.childName == 'Tree2', orderBy="aprop")) == [t2, t4, t5]

Modified: SQLObject/branches/0.7-bugfix/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.7-bugfix/sqlobject/main.py	2007-01-23 17:11:12 UTC (rev 2237)
+++ SQLObject/branches/0.7-bugfix/sqlobject/main.py	2007-01-23 17:13:55 UTC (rev 2238)
@@ -804,6 +804,8 @@
                 currentClass = currentClass._parentClass
                 for column in currentClass.sqlmeta.columnDefinitions.values():
                     if type(column) == col.ForeignKey: continue
+                    if column.name == 'childName':
+                        continue
                     setattr(cls.q, column.name,
                         getattr(currentClass.q, column.name))