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

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

Author: phd
Date: 2006-10-26 10:06:23 -0600 (Thu, 26 Oct 2006)
New Revision: 2032

Modified:
   SQLObject/trunk/sqlobject/main.py
Log:
A bug fix for duplicate names test in case of inheritance.


Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2006-10-26 15:55:32 UTC (rev 2031)
+++ SQLObject/trunk/sqlobject/main.py	2006-10-26 16:06:23 UTC (rev 2032)
@@ -326,7 +326,7 @@
             if hasattr(base, "sqlmeta"):
                 parent_columns.extend(base.sqlmeta.columns.keys())
         if name in dir(soClass):
-            assert name in parent_columns, (
+            assert  name in parent_columns or name == "childName", (
                 "The class %s.%s already has a variable or method %r, you cannot "
                 "add the column %r"
                 % (soClass.__module__, soClass.__name__, name, name))