Author: phd
Date: 2006-12-22 08:20:21 -0700 (Fri, 22 Dec 2006)
New Revision: 2149
Modified:
home/phd/SQLObject/paramstyles/sqlobject/main.py
home/phd/SQLObject/paramstyles/sqlobject/tests/test_basic.py
Log:
Merged patches from the revisions 2146:2148 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-12-22 15:17:02 UTC (rev 2148)
+++ home/phd/SQLObject/paramstyles/sqlobject/main.py 2006-12-22 15:20:21 UTC (rev 2149)
@@ -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: home/phd/SQLObject/paramstyles/sqlobject/tests/test_basic.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_basic.py 2006-12-22 15:17:02 UTC (rev 2148)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_basic.py 2006-12-22 15:20:21 UTC (rev 2149)
@@ -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"
|
