Changeset 296

Timestamp:

01/29/08 23:26:49 (10 months ago)

Author:

johnbywater

Message:

Added support for temporal persistence of domain object attributes.

Files:

• trunk/src/dm/application.py (modified) (1 diff)
• trunk/src/dm/builder.py (modified) (2 diffs)
• trunk/src/dm/db.py (modified) (9 diffs)
• trunk/src/dm/dom/base.py (modified) (3 diffs)
• trunk/src/dm/dom/meta.py (modified) (6 diffs)
• trunk/src/dm/dom/registry.py (modified) (3 diffs)
• trunk/src/dm/dom/temporaltest.py (modified) (2 diffs)
• trunk/src/dm/test.py (modified) (2 diffs)
• trunk/src/dm/testunit.py (modified) (1 diff)
• trunk/src/dm/timepoint.py (added)
• trunk/src/dm/timepointtest.py (added)

trunk/src/dm/application.py

@@ -1 +1 @@
-from dm.ioc import *
-from dm.builder import ApplicationBuilder
+from dm.testunit import ApplicationBuilder
-
-class Application(object):

trunk/src/dm/builder.py

@@ -19 +19 @@
-        features.register('FileSystem',       self.findFileSystem())
-        features.register('AccessController', self.findAccessController())
+        features.register('Timepoint',        self.findTimepoint())
-
-    def findSystemDictionary(self):
@@ -64 +65 @@
-        return dm.accesscontrol.SystemAccessController()
-
+    def findTimepoint(self):
+        import dm.timepoint
+        return dm.timepoint.Timepoint()
+

trunk/src/dm/db.py

@@ -48 +48 @@
-debug = RequiredFeature('Debug')
-logger = RequiredFeature('Logger')
+timepoint = RequiredFeature('Timepoint')
-
-moddebug = False
@@ -144 +145 @@
-            if '__dateCreatedAfter__' in kwds:
-                return True
+            if '__dateCreatedOnOrBefore__' in kwds:
+                return True
-            if '__dateCreatedBefore__' in kwds:
-                return True
@@ -191 +194 @@
-            return records
-       
-
+__loadedList__=None, 
-            "Create new recorded domain object."
-            newRecord = self.createRecord(className, *args, **kwds)
@@ -197 +200 @@
-                message = "Created new db record. %s" % newRecord
-                logger.debug(message)
-
+loadedList=__loadedList__
-            return newObject
-          
@@ -491 +494 @@
-                mapperAttributes['_table'] = self.dbName
-        for a in self.attributes:
+            if a.dom.isTemporal:
+                continue
-            mapperClassAttribute = a.createMapperClassAttribute()
-            if mapperClassAttribute:
@@ -738 +743 @@
-            logger.debug(message)
-        self.domainObject.id = self.id
+        recordedTime = timepoint.recorded
-        for metaAttr in self.meta.attributes:
-            dbName = metaAttr.dbName
@@ -746 +752 @@
-                )
-                logger.debug(message)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                mapper = getattr(self, dbName)
-                if mapper:
@@ -780 +798 @@
-        isChanged = False
-        for metaAttr in self.meta.attributes:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                domainObject = getattr(self.domainObject, metaAttr.domName)
-                if domainObject and hasattr(domainObject, 'record'):
@@ -969 +1005 @@
-                )
-                sqlEqualsList.append(sqlEquals)
+            elif name == '__dateCreatedOnOrBefore__':
+                sqlSafeName = self.makeSqlName('date_created')
+                sqlEquals = "%s <= %s" % (
+                    sqlSafeName, sqlSafeValue
+                )
+                sqlEqualsList.append(sqlEquals)
-            elif name == '__dateCreatedAfter__':
-                sqlSafeName = self.makeSqlName('date_created')

trunk/src/dm/dom/base.py

@@ -245 +245 @@
-                object.save()
-        except KforgeDbError, inst:
- 
+
-        else:
-            return object
@@ -282 +282 @@
-            return None
-    
-
+__loadedList__=None, 
-        objectList = []
-        for record in self.findRecords(**kwds):
-
+__loadedList__
-            objectList.append(domainObject)
-        self.sortDomainObjects(objectList)
@@ -673 +673 @@
-        self.decacheItem()
-        if self.record:
+            self.deleteTemporalAttributeObjects()
-            self.record.domainObject = None
-            self.record.destroySelf()
-            self.record = None
+
+    def deleteTemporalAttributeObjects(self):
+        for metaAttr in self.meta.attributes:
+            if metaAttr.isTemporal:
+                r = metaAttr.createTemporalCollection(self)
+                [i.delete() for i in r]
-
-    def purgeAggregates(self):

trunk/src/dm/dom/meta.py

@@ -112 +112 @@
-
-
+class TemporalCollection(object):
+
+    def __init__(self, register):
+        self.register = register
+
+    def __get__(self, obj, type=None):
+        print "Got __get__()"
+
+    def __set__(self, obj, value):
+        print "Got __set__(%s)" % value
+
+
-class MetaDomainAttr(MetaBase):
-    "Models a domain object attribute."
@@ -120 +132 @@
-    isImageFile = False
-
-
+Bitemporal=False, is
-        self.typeName = typeName
-        self.name = name
@@ -139 +151 @@
-        self.isIndexed = isIndexed
-        self.isTemporal = isTemporal
+        if self.isIndexed and self.isTemporal:
+            raise Exception, "Can't be indexed and temporal, at the mo."
+        self.isBitemporal = isBitemporal
+        if self.isBitemporal:
+            self.isTemporal = True
+        self.isBitemporal = False  # Cut this out for the moment.
+        self.temporalDomainClass = None
-
-    def __repr__(self):
@@ -163 +182 @@
-            setattr(domainObject, self.name, initialValue) 
-    
+    def setTemporalDomainClass(self, domainClass):
+        self.temporalDomainClass = domainClass
+        self.temporalDomainClass.registerKeyName = 'dateCreated'
+        self.temporalDomainClass.isCached = True
+        self.temporalDomainClass.sortOnName = 'id'
+        self.temporalDomainClass.sortAscending = False
+
+    def createTemporalCollection(self, domainObject):
+        register = self.temporalDomainClass.createRegister()
+        register.ownerName = 'parent'
+        register.owner = domainObject
+        return register
+        
-    def createInitialValue(self, domainObject):
-        return None
@@ -226 +258 @@
-        dbValue = domainValue
-        return dbValue
+
+    def duplicateTemporal(self):
+        attrMeta = self.duplicateSelf()
+        # Not bitemporal ATM. Just an idea for 'stepping down' the temporal: 
+        if self.isBitemporal:
+             attrMeta.isTemporal = True
+             attrMeta.isBitemporal = False
+        else:
+             attrMeta.isTemporal = False
+        return attrMeta
+
+    def duplicateSelf(self):
+        return type(self)()
-
-
@@ -546 +591 @@
-            self.logger.debug(msg)
-        return attrValue
+
+    def duplicateSelf(self):
+        return type(self)(self.typeName)
-
-

trunk/src/dm/dom/registry.py

@@ -5 +5 @@
-from dm.exceptions import * 
-import inspect
+import dm.times
-
-class DomainRegistry(AbstractList):
@@ -29 +30 @@
-        domainClass = metaDomainObject.createDomainClass(baseClass)
-        self.registerDomainClass(domainClass)
+        return domainClass
-
-    def getDomainClassRegister(self):
@@ -82 +84 @@
-        for name in classRegister:
-            self.checkHasAsForHasManys(classRegister[name])
+        self.createTemporalAttributePersistence(domainClass.meta)
+
+    def createTemporalAttributePersistence(self, domainClassMeta):
+        temporalAttrs = []
+        for a in domainClassMeta.attributes:
+            if a.isTemporal:
+                new = self.createTemporalDomainClass(domainClassMeta, a)
+                a.setTemporalDomainClass(new)
+
+    def createTemporalDomainClass(self, classMeta, attrMeta):
+        temporalClassName = classMeta.name + '_t_' + attrMeta.name
+        metaTemporalObject = DomainObject.metaClass(temporalClassName)
+        metaTemporalObject.recordedValue = attrMeta.duplicateTemporal()
+        metaTemporalObject.parent = HasA(classMeta.name, isRequired=True)
+        metaTemporalObject.dateCreated = DateTime(isIndexed=True,
+            isRequired=True, default=mx.DateTime.now)
+        return self.createDomainClass(metaTemporalObject)
-
-    def setMetaAttributesFromClass(self, domainClass, domainClassMeta):

trunk/src/dm/dom/temporaltest.py

@@ -2 +2 @@
-from dm.dom.testunit import TestCase
-from dm.exceptions import *
-
+
+
+
+
+
-
-def suite():
-    suites = [
-Attributed
+
-    ]
-    return unittest.TestSuite(suites)
@@ -13 +17 @@
-# Todo: Separate out the testing of indexes from testing of temporal attribute.
-
-Attributed
+
-    "Temporally attributed domain object."
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def setUp(self):
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        for i in range(1,5):
-            newName = "%s%s" % (self.fixtureName, i)
-Attributed
+
-
-    def tearDown(self):
-        for i in range(1,5):
-            newName = "%s%s" % (self.fixtureName, i)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    def test_meta(self):
-        metaAttr = self.fixture.meta.attributeNames['description']
-
-
-
+
+
+
+
+
-        metaAttr = self.fixture.meta.attributeNames['name']
-        self.failUnlessEqual(metaAttr.isIndexed, True)
+        self.failUnlessEqual(metaAttr.isTemporal, False)
-
-    def test_new(self):
-temporalAttributed, "New temporalAttributed could not be created."
+fixture
-        self.failUnlessRaises(KforgeDomError,
-Attributed
+
-        )
+        self.failUnlessEqual(type(self.fixture.description), type(""))
+        self.failUnlessEqual(self.fixture.description, "")
+
-
-    def test_find(self):
-Attributeds['TestTemporalAttributed
-Attributed
+s['TestTemporal
+
-        )
-        self.failUnlessRaises(KforgeRegistryKeyError,
-Attributed
+
-        )
-
-    def test_save(self):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def test_count(self):
-Attributeds.count(), "Problem with temporalAttributed
+s.count(), "Problem with temporal
-
-    def test_keys(self):
-Attributeds.keys(), "Problem with temporalAttributed
+s.keys(), "Problem with temporal
-
-    def test_iter(self):
-Attributeds.__iter__(), "Problem with temporalAttributed
-Attributed
-Attributed
+s.__iter__(), "Problem with temporal
+
+
-
-    def test_getNextObject(self):
-AttributedList = self.temporalAttributed
-Attributed
+List = self.temporal
+
-        self.failUnless(lenList >= 4, lenList)
-Attributed = temporalAttributed
-Attributed = self.temporalAttributeds.getNextObject(temporalAttributedList, temporalAttributed
-Attributed, temporalAttributed
-Attributed = self.temporalAttributeds.getNextObject(temporalAttributedList, nextTemporalAttributed
-Attributed, temporalAttributed
-Attributed = self.temporalAttributeds.getNextObject(temporalAttributedList, nextTemporalAttributed
-Attributed
+ = temporal
+ = self.temporals.getNextObject(temporalList, temporal
+, temporal
+ = self.temporals.getNextObject(temporalList, nextTemporal
+, temporal
+ = self.temporals.getNextObject(temporalList, nextTemporal
+
-        
-    def test_getPreviousObject(self):
-AttributedList = self.temporalAttributed
-Attributed
+List = self.temporal
+
-        self.failUnless(lenList >= 4, lenList)
-Attributed = temporalAttributed
-Attributed = self.temporalAttributeds.getPreviousObject(temporalAttributedList, temporalAttributed
-Attributed, temporalAttributed
-Attributed = self.temporalAttributeds.getPreviousObject(temporalAttributedList, previousTemporalAttributed
-Attributed, temporalAttributed
-Attributed = self.temporalAttributeds.getPreviousObject(temporalAttributedList, previousTemporalAttributed
-Attributed
-
-
+ = temporal
+ = self.temporals.getPreviousObject(temporalList, temporal
+, temporal
+ = self.temporals.getPreviousObject(temporalList, previousTemporal
+, temporal
+ = self.temporals.getPreviousObject(temporalList, previousTemporal
+
+
+

trunk/src/dm/test.py

@@ -1 +1 @@
-import dm.timestest
+import dm.timepointtest
-import dm.strategytest
-import dm.environmenttest
@@ -23 +24 @@
-    suites = [
-        dm.timestest.suite(),
+        dm.timepointtest.suite(),
-        dm.strategytest.suite(),
-        dm.environmenttest.suite(),

trunk/src/dm/testunit.py

@@ -22 +22 @@
-    def construct(self):
-        super(ModelBuilder, self).construct()
-Attributed
+
-
-Attributed
-Attributed
-Attributed
-Attributeds = TemporalAttributed
+
+
+
+s = Temporal
-
-