Changeset 303

Timestamp:

01/31/08 23:58:35 (1 year ago)

Author:

johnbywater

Message:

Added support for 'isTemporal' on DomainObject? classes.

Files:

• trunk/src/dm/db.py (modified) (5 diffs)
• trunk/src/dm/dom/base.py (modified) (2 diffs)
• trunk/src/dm/dom/meta.py (modified) (6 diffs)
• trunk/src/dm/dom/registry.py (modified) (4 diffs)
• trunk/src/dm/dom/temporal.py (modified) (2 diffs)
• trunk/src/dm/dom/temporaltest.py (modified) (4 diffs)
• trunk/src/dm/testunit.py (modified) (1 diff)
• trunk/src/dm/timepointtest.py (modified) (1 diff)

trunk/src/dm/db.py

@@ -743 +743 @@
-            )
-            logger.debug(message)
+        currentVersion = None
+        if self.domainObject.meta.isTemporal:
+            r = self.domainObject.meta.createTemporalCollection(self.domainObject)
+            loadedList = {self.domainObject: self.domainObject}
+            currentVersion = r.findFirstDomainObject(loadedList=loadedList)
-        self.domainObject.id = self.id
-        for metaAttr in self.meta.attributes:
@@ -757 +762 @@
-                    mapperValue = self.parent.domainObject
-                    self.domainObject.parent = mapperValue
-                    #message = "Continuing with loaded parent: %s" % (
-                    #    self.domainObject.parent
-                    #)
-                    #logger.debug(message)
-                    continue
-            if metaAttr.dom.isTemporal:
-                # We don't persist temporal attributes on the parent.
-                #     - we need to look in the temporal model.
-
-
-
-
+
+
+
+
+
+
+
+
+
-                else:
-
-
-
+
+
+
+
+
+
+
+
-            elif metaAttr.isDomainObjectRef:
-                mapper = getattr(self, dbName)
@@ -806 +817 @@
-        "Sets attributes of record object from domain object."
-        isChanged = False
+        isChangedTemporal = False
+        currentVersion = None
+        if self.domainObject.meta.isTemporal:
+            r = self.domainObject.meta.createTemporalCollection(self.domainObject)
+            loadedList = {self.domainObject: self.domainObject}
+            currentVersion = r.findFirstDomainObject(loadedList=loadedList)
+            if not currentVersion:
+                currentVersion = r.create(loadedList=loadedList)
+                isChangedTemporal = True
+            else:
+                for metaAttr in self.domainObject.meta.attributes:
+                    if metaAttr.isTemporal:
+                        domName = metaAttr.name
+                        recordedValue = getattr(currentVersion, domName)
+                        actualValue = getattr(self.domainObject, domName)
+                        if actualValue != recordedValue:
+                            isChangedTemporal = True
+                if isChangedTemporal:
+                    currentVersion = r.create(loadedList=loadedList)
-        for metaAttr in self.meta.attributes:
-            domValue = getattr(self.domainObject, metaAttr.domName)
@@ -812 +842 @@
-                # We don't persist temporal attributes on the parent.
-                #     - we need to look in the temporal model.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            elif metaAttr.isDomainObjectRef:
-                domainObject = domValue
@@ -832 +866 @@
-                    setattr(self, metaAttr.dbName, domValue)
-                    isChanged = True
+        if isChangedTemporal:
+            currentVersion.save()
-        if isChanged:
-            if moddebug and debug:

trunk/src/dm/dom/base.py

@@ -504 +504 @@
-    isConstant = False
-    isUnique = True
+    isTemporal = False
-    searchAttributeNames = []
-    startsWithAttributeName = ''
@@ -672 +673 @@
-        self.decacheItem()
-        if self.record:
-Attribute
+
-            self.record.domainObject = None
-            self.record.destroySelf()
-            self.record = None
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    def purgeAggregates(self):

trunk/src/dm/dom/meta.py

@@ -23 +23 @@
-
-
+# Todo: Somthing about this being used *only* in the db layer (now).
-class MetaBase(object):
+    "Domain model meta supertype."
+
+    registry = RequiredFeature('DomainRegistry')
+    dictionary = RequiredFeature('SystemDictionary')
+    logger = RequiredFeature('Logger')
+    debug = RequiredFeature('Debug')
+
+
+class BaseDomainMeta(object):
-    "Domain model meta supertype."
-
@@ -50 +60 @@
-        return spaceSep
-
+    def setTemporalDomainClass(self, domainClass):
+        self.temporalDomainClass = domainClass
+
+    def createTemporalCollection(self, domainObject):
+        if not domainObject:
+            raise Exception, "Need a domain object! %s" % domainObject
+        register = self.temporalDomainClass.createRegister(
+            ownerName='parent',
+            owner=domainObject,
+            metaAttr=self
+        )
+        return register
+        
-    
-MetaBase
+BaseDomainMeta
-    "Models a domain object."
+    # Todo: Rename to DomainObjectMeta?
-
-    reservedAttrNames = ('id', 'record', 'registerCache', 'projectUrls', 'paths', 'pluginController', 'metaClass', 'meta', 'registerKeyName', 'registerClass', 'registry') 
@@ -73 +97 @@
-            self.isEditable = False
-        self.attributesDeferred = {}
+        self.isTemporal = False
-
-    def __setattr__(self, attrName, attrVal):
@@ -114 +139 @@
-
-
-MetaBase
+BaseDomainMeta
-    "Models a domain object attribute."
-
@@ -147 +172 @@
-            self.isTemporal = True
-        self.isBitemporalActual = False
-        self.temporalDomainClass = None
-
-    def __repr__(self):
@@ -172 +196 @@
-            setattr(domainObject, self.name, initialValue) 
-    
-    def setTemporalDomainClass(self, domainClass):
-        self.temporalDomainClass = domainClass
-
-    def createTemporalCollection(self, domainObject):
-        if not domainObject:
-            raise Exception, "Need a domain object! %s" % domainObject
-        register = self.temporalDomainClass.createRegister(
-            ownerName='parent',
-            owner=domainObject,
-            metaAttr=self
-        )
-        return register
-        
-    def createInitialValue(self, domainObject):
-        return None

trunk/src/dm/dom/registry.py

@@ -2 +2 @@
-from dm.dom.base import *
-from dm.dom.stateful import *
-
+, TemporalRevision
-from dm.ioc import * 
-from dm.exceptions import * 
@@ -45 +45 @@
-        domainClass.meta.isUnique = domainClass.isUnique
-        domainClass.meta.isCached = domainClass.isConstant
+        domainClass.meta.isTemporal = domainClass.isTemporal
-        classRegister[domainClassName] = domainClass
-        domainClass.isRegistered = True
@@ -51 +52 @@
-        for name in classRegister:
-            self.checkHasAsForHasManys(classRegister[name])
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def getDomainClassRegister(self):
@@ -89 +127 @@
-            raise Exception, "Domain class '%s' is not defined." % className
-        return classRegister[className]
-
-    def generateTemporalClass(self, parentMeta, attrMeta):
-        if attrMeta.isBitemporalActual:
-            temporalBase = BitemporalActual
-        elif attrMeta.isBitemporal:
-            temporalBase = BitemporalProperty
-        else:
-            temporalBase = TemporalProperty
-        temporalClassName = "%s_tmpr_%s" % (parentMeta.name, attrMeta.name)
-        temporalMeta = temporalBase.metaClass(temporalClassName)
-        temporalMeta.recordedValue = attrMeta.duplicateTemporal()
-        temporalMeta.parent = HasA(parentMeta.name, isRequired=True)
-        temporalClass = self.createDomainClass(temporalMeta, temporalBase)
-        attrMeta.setTemporalDomainClass(temporalClass)
-
-    def setMetaAttributesFromClass(self, domainClass, domainClassMeta):

trunk/src/dm/dom/temporal.py

@@ -85 +85 @@
-
-
-Property
+
-
-    isUnique = False
-    isConstant = True
-
-    dateCreated = DateTime(
-        isIndexed=True,
-        isRequired=True,
-    )
-    parent = Integer(default=1)           # Abstract.
-    recordedValue = String(default='')    # Abstract.
-
-    sortAscending = False
-    sortOnName = 'id'
+
+    dateCreated = DateTime(isIndexed=True, isRequired=True)
+    # Overidden by HasA(parentClassName) meta attrrbute.
+    parent = Integer(default=1)           
+
+    def makeTemporalName(self, className, attrName=None):
+        if attrName:
+            return "%sHist_%s" % (className, attrName)
+        else:
+            return "%sHist" % className
+
+    makeTemporalName = classmethod(makeTemporalName)
+
+
+class BaseTemporalProperty(BaseTemporal):
+
+    # Overidden by actually recorded meta attribute.
+    recordedValue = String(default='')
-    
-
@@ -123 +133 @@
-        return actualsMeta.createTemporalCollection(self)
-
+
+class TemporalRevisionCollection(BaseTemporalCollection):
+
+    def create(self, loadedList={}, dateCreated=None):
+        return super(TemporalRevisionCollection, self).create(
+            loadedList=loadedList,
+            dateCreated=dateCreated,
+        )
+
+
+class TemporalRevision(BaseTemporal):
+
+    registerClass = TemporalRevisionCollection
+
+

trunk/src/dm/dom/temporaltest.py

@@ -12 +12 @@
-def suite():
-    suites = [
-        unittest.makeSuite(TestTemporal),  # Example
-        unittest.makeSuite(TestTemporalProperty),
-        unittest.makeSuite(TestBitemporalActual),
-        unittest.makeSuite(TestBitemporalProperty),
+        unittest.makeSuite(TestTemporal),  # Example of DomainObject with temporal properties.
+        unittest.makeSuite(TestTemporalObjectExample),
-    ]
-    return unittest.TestSuite(suites)
@@ -22 +23 @@
-# Todo: Separate out the testing of indexes from testing of temporal attribute.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -43 +91 @@
-
-    def tearDown(self):
+        super(TestTemporalProperty, self).tearDown()
-        self.timepoint.reset()
-        self.collection = None
@@ -218 +267 @@
-
-
+class Temporal(SimpleNamedObject):  # Example
+    "Temporally attributed domain object."
+
+    # Todo: Exception when register key attribute is temporal.
+    name = String(default='', isIndexed=True)
+    description = String(default='', isTemporal=True)
+    firstkiss = DateTime(isTemporal=True, default=mx.DateTime.now())
+    state = HasA('State', isTemporal=True, isRequired=False)
+    haircolor = String(default='My Natural Color', isBitemporal=True)
+
+
+# Todo: Support for passing temporal attribute value as create kwds.
+
-class TestTemporal(TestCase):  # Example
-    "TestCase for the Temporal class."

trunk/src/dm/testunit.py

@@ -27 +27 @@
-        from dm.dom.temporaltest import Temporal
-        self.registry.registerDomainClass(Temporal)
+        from dm.dom.temporaltest import TemporalObjectExample
+        self.registry.registerDomainClass(TemporalObjectExample)
-        self.registry.temporals = Temporal.createRegister()
-        from dm.dom.temporal import TemporalProperty, BitemporalProperty, BitemporalActual

trunk/src/dm/timepointtest.py

@@ -42 +42 @@
-        now1 = self.timepoint.recorded
-        import time
-2
+1
-        now2 = self.timepoint.recorded
-        self.failUnless(now2 > now1)