[SQL-CVS] r2202 - in home/phd/SQLObject/paramstyles/sqlobject/versioning: . test

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

Author: phd
Date: 2007-01-11 07:14:00 -0700 (Thu, 11 Jan 2007)
New Revision: 2202

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py
   home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py
Log:
Merged patches from the revisions 2197:2201 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py	2007-01-10 21:35:55 UTC (rev 2201)
+++ home/phd/SQLObject/paramstyles/sqlobject/versioning/__init__.py	2007-01-11 14:14:00 UTC (rev 2202)
@@ -18,7 +18,7 @@
 
     def getChangedFields(self):
         next = self.nextVersion()
-        columns = self.__class__.sqlmeta.columns
+        columns = self.masterClass.sqlmeta.columns
         fields = []
         for column in columns:
             if column not in ["dateArchived", "id", "masterID"]:
@@ -45,7 +45,11 @@
 
 
 class Versioning(object):
-    def __init__(self):
+    def __init__(self, extraCols = None):
+        if extraCols:
+            self.extraCols = extraCols
+        else:
+            self.extraCols = {}
         pass
 
     def __addtoclass__(self, soClass, name):
@@ -59,6 +63,8 @@
 
         getColumns (attrs, self.soClass)
 
+        attrs.update(self.extraCols)
+
         self.versionClass = type(self.soClass.__name__+'Versions',
                                  (Version,),
                                  attrs)

Modified: home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py	2007-01-10 21:35:55 UTC (rev 2201)
+++ home/phd/SQLObject/paramstyles/sqlobject/versioning/test/test_version.py	2007-01-11 14:14:00 UTC (rev 2202)
@@ -39,8 +39,16 @@
     foreign = ForeignKey("Base")
     versions = Versioning()
 
+def _set_extra():
+    return "read all about it"
+
+class Extra(SQLObject):
+    name = StringCol()
+    versions = Versioning(extraCols={'extra' : StringCol(default=_set_extra())})
+
+
 def setup():
-    for cls in [MyClass, Base, Child, Government, Monarchy, VChild, HasForeign]:
+    for cls in [MyClass, Base, Child, Government, Monarchy, VChild, HasForeign, Extra]:
         if hasattr(cls, 'versions') and hasattr(cls, "_connection") and \
                 cls._connection.tableExists(cls.sqlmeta.table):
             setupClass(cls.versions.versionClass)
@@ -132,3 +140,10 @@
     has_foreign = HasForeign(foreign = base1)
     has_foreign.foreign = base2
     assert has_foreign.versions[0].foreign == base1
+
+def test_extra():
+    setup()
+    extra = Extra(name='title')
+    extra.name = 'new'
+    assert extra.versions[0].extra == 'read all about it'    
+    assert sorted(extra.versions[0].getChangedFields()) == ['Name']