Changeset 304

Timestamp:

02/01/08 02:53:42 (1 year ago)

Author:

johnbywater

Message:

Making use of sqlobject's indexes and defaultOrder features.

Files:

• trunk/src/dm/db.py (modified) (2 diffs)
• trunk/src/dm/dom/base.py (modified) (1 diff)
• trunk/src/dm/dom/meta.py (modified) (1 diff)
• trunk/src/dm/dom/registry.py (modified) (1 diff)
• trunk/src/dm/dom/stateful.py (modified) (1 diff)
• trunk/src/dm/dom/temporal.py (modified) (2 diffs)
• trunk/src/dm/dom/temporaltest.py (modified) (3 diffs)

trunk/src/dm/db.py

@@ -453 +453 @@
-            if not domAttr.isList():
-                self.addAttribute(domAttr)
+        self.sortOnDbName = None
+        if self.dom.sortOn:
+            self.sortOnDbName = self.dom.sortOn.dbName
+        self.sortAscending = self.dom.sortAscending
-
-    def getAttribute(self, attrName):
@@ -482 +486 @@
-            if self.isCached:
-                mapper.sqlmeta.cacheValues = True
+            if self.sortOnDbName:
+                defaultOrder = getattr(mapper.q, self.sortOnDbName)
+                if not self.sortAscending:
+                    defaultOrder = DESC(defaultOrder)
+                mapper.sqlmeta.defaultOrder = defaultOrder
+                    
-            # Todo: Figure indexes in sqlmeta.
-            #indexes = self.getSQLObjectIndexes()

trunk/src/dm/dom/base.py

@@ -869 +869 @@
-
-    registerKeyName = 'name'
-
-
+isIndexed=True
+

trunk/src/dm/dom/meta.py

@@ -98 +98 @@
-        self.attributesDeferred = {}
-        self.isTemporal = False
+        self.sortOn = None
+
+    def setSortOnAttr(self, sortOnName):
+        if sortOnName and sortOnName != 'id':
+            sortOn = self.attributeNames[sortOnName]
+            super(MetaDomainObject, self).__setattr__('sortOn', sortOn)
-
-    def __setattr__(self, attrName, attrVal):

trunk/src/dm/dom/registry.py

@@ -46 +46 @@
-        domainClass.meta.isCached = domainClass.isConstant
-        domainClass.meta.isTemporal = domainClass.isTemporal
+        domainClass.meta.setSortOnAttr(domainClass.sortOnName)
+        domainClass.meta.sortAscending = domainClass.sortAscending
-        classRegister[domainClassName] = domainClass
-        domainClass.isRegistered = True

trunk/src/dm/dom/stateful.py

@@ -133 +133 @@
-    dateCreated = DateTime(
-        default=dm.times.getUniversalNow,
+        isIndexed=True,
-        isEditable=False
-    )

trunk/src/dm/dom/temporal.py

@@ -89 +89 @@
-    isUnique = False
-    isConstant = True
+    sortOnName = 'dateCreated'
-    sortAscending = False
-    sortOnName = 'id'
-
-    dateCreated = DateTime(isIndexed=True, isRequired=True)
-
-
+
-
-    def makeTemporalName(self, className, attrName=None):
@@ -104 +103 @@
-    makeTemporalName = classmethod(makeTemporalName)
-
-
-class BaseTemporalProperty(BaseTemporal):
-
-    # Overidden by actually recorded meta attribute.
-    recordedValue = String(default='')
-    
-
-class TemporalProperty(BaseTemporalProperty):
-
-    registerClass = TemporalCollection
-
-
-class BitemporalActual(BaseTemporalProperty):
-
-    registerClass = BitemporalActualCollection
-    sortOnName = 'dateCreated'
-
-    def getSortOnValue(self):
-        return (self.dateCreated, self.id)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    registerClass = BitemporalCollection

trunk/src/dm/dom/temporaltest.py

@@ -105 +105 @@
-        self.failUnlessEqual(TemporalProperty.isConstant, True)
-        self.failUnlessEqual(TemporalProperty.registerKeyName, 'id')
-i
+dateCreate
-        self.failUnlessEqual(TemporalProperty.sortAscending, False)
-
@@ -111 +111 @@
-        self.property = self.collection.create(recordedValue='')
-        self.failUnless(self.property.dateCreated)
-
+
+
-
-    def test_getReferenceTime(self):
@@ -201 +202 @@
-        self.failUnlessEqual(TemporalProperty.isConstant, True)
-        self.failUnlessEqual(TemporalProperty.registerKeyName, 'id')
-i
+dateCreate
-        self.failUnlessEqual(TemporalProperty.sortAscending, False)
-