[SQL-CVS] r2147 - in SQLObject/trunk/sqlobject: . tests

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

Author: phd
Date: 2006-12-22 08:16:39 -0700 (Fri, 22 Dec 2006)
New Revision: 2147

Modified:
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/tests/test_basic.py
Log:
idName can be inherited from the parent sqlmeta class.


Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2006-12-20 03:35:29 UTC (rev 2146)
+++ SQLObject/trunk/sqlobject/main.py	2006-12-22 15:16:39 UTC (rev 2147)
@@ -220,7 +220,7 @@
     __metaclass__ = declarative.DeclarativeMeta
 
     # These attributes shouldn't be shared with superclasses:
-    _unshared_attributes = ['table', 'idName', 'columns', 'childName']
+    _unshared_attributes = ['table', 'columns', 'childName']
 
     # These are internal bookkeeping attributes; the class-level
     # definition is a default for the instances, instances will

Modified: SQLObject/trunk/sqlobject/tests/test_basic.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_basic.py	2006-12-20 03:35:29 UTC (rev 2146)
+++ SQLObject/trunk/sqlobject/tests/test_basic.py	2006-12-22 15:16:39 UTC (rev 2147)
@@ -290,3 +290,15 @@
         pass
     else:
         assert 0, "Expected an AttributeError"
+
+class myid_sqlmeta(sqlmeta):
+    idName = "my_id"
+
+class TestSO12(SQLObject):
+    class sqlmeta(myid_sqlmeta):
+        pass
+    name = StringCol()
+
+def test_sqlmeta_inherited_idName():
+    setupClass(TestSO12)
+    assert TestSO12.sqlmeta.idName == "my_id"