Changeset 294

Timestamp:

01/27/08 00:47:12 (10 months ago)

Author:

johnbywater

Message:

Added support for creating indexes of attributes.

Files:

• trunk/src/dm/__init__.py (modified) (1 diff)
• trunk/src/dm/db.py (modified) (2 diffs)
• trunk/src/dm/dom/meta.py (modified) (3 diffs)
• trunk/src/dm/domtest.py (modified) (2 diffs)
• trunk/src/dm/migrate.py (modified) (2 diffs)
• trunk/src/dm/testunit.py (modified) (1 diff)
• trunk/src/dm/view/registrytest.py (modified) (1 diff)

trunk/src/dm/__init__.py

@@ -1 @@
-9
+11

trunk/src/dm/db.py

@@ -477 +477 @@
-            if self.dbName:
-                mapper.sqlmeta.table = self.dbName
-
-
+
+
+
+
+
+
-        return mapper
-
@@ -497 +501 @@
-                mapperAttributes[setMethodName] = setMethod
-                mapperAttributes[getMethodName] = getMethod
+            if a.dom.isIndexed:
+                indexName = "%sIndex" % a.dbName
+                index = DatabaseIndex(mapperClassAttribute)
+                mapperAttributes[indexName] = index
+
-        return mapperAttributes
+
+    def getSQLObjectIndexes(self):
+        indexes = []
+        for mapperAttr in self.attributes:
+            if mapperAttr.dom.isIndexed:
+                indexes.append(DatabaseIndex(mapperAttr.dbName))
+        return indexes
-
-    def createClass(self, name, base, attrs):
-        newClass = type(name, (base,), attrs)
-        #for a in self.attributes:
-        #    if a.dom.isImageFile:
-        #        setMethodName = '_set_%s' % a.dbName
-        #        getMethodName = '_get_%s' % a.dbName
-        #        setMethod = a.dom.setFileContent
-        #        getMethod = a.dom.getFileContent
-        #        setattr(newClass, setMethodName, setMethod)
-        #        setattr(newClass, getMethodName, getMethod)
-        return newClass
-

trunk/src/dm/dom/meta.py

@@ -120 +120 @@
-    isImageFile = False
-
-
+isTemporal=False, isIndexed=False, 
-        self.typeName = typeName
-        self.name = name
@@ -137 +137 @@
-        self.isRequired = isRequired
-        self.getChoices = getChoices
+        self.isIndexed = isIndexed
+        self.isTemporal = isTemporal
-
-    def __repr__(self):
@@ -486 +488 @@
-    def getObjectByKey(self, key):
-        domainRegister = self.getDomainRegister()
+        if self.dictionary[DB_MIGRATION_IN_PROGRESS]:
+            if hasattr(domainRegister, 'getAll'):
+                domainRegister = domainRegister.getAll()
-        return domainRegister[key]
-

trunk/src/dm/domtest.py

@@ -6 +6 @@
-import dm.dom.imagetest
-import dm.dom.registrytest
+import dm.dom.temporaltest
-
-def suite():
@@ -15 +16 @@
-        dm.dom.imagetest.suite(),
-        dm.dom.registrytest.suite(),
+        dm.dom.temporaltest.suite(),
-    ]
-    return unittest.TestSuite(suites)

trunk/src/dm/migrate.py

@@ -149 +149 @@
-        self.idMap = {}
-        for className in self.importOrder:
+            print "Importing %s objects." % className
-            domainClass = self.registry.getDomainClass(className)
-            classRegister = domainClass.createRegister()
@@ -245 +246 @@
-                    idMapKey = "%s %s" % (className, objectId)
-                    self.idMap[idMapKey] = newObjectId
+                msg = "Importing %s #%s OK" % (
+                    className, objectId
+                )
+                print msg
+            print "Importing %s objects completed OK." % className
+        print "Imported all domain objects records OK."
-
-

trunk/src/dm/testunit.py

@@ -9 +9 @@
-import dm.builder
-from dm.ioc import *
+import dm.dom.builder
-
-features.allowReplace = True
+
-
-class SystemModeError(Exception):
-    pass
-
+
+class ModelBuilder(dm.dom.builder.ModelBuilder):
+
+    def construct(self):
+        super(ModelBuilder, self).construct()
+        self.loadTemporalAttributed()
+
+    def loadTemporalAttributed(self):
+        from dm.dom.temporaltest import TemporalAttributed
+        self.registry.registerDomainClass(TemporalAttributed)
+        self.registry.temporalAttributeds = TemporalAttributed.createRegister()
+
+
+class ApplicationBuilder(dm.builder.ApplicationBuilder):
+
+    def findModelBuilder(self):
+        return ModelBuilder()
+
+
-class ApplicationTestSuite(unittest.TestSuite):
-
-dm.builder.
+
-
-    def buildApplication(self):

trunk/src/dm/view/registrytest.py

@@ -105 +105 @@
-        self.view.userQuery = 'i'
-        results = self.view.searchManipulatedRegister()
-
+, [i.name for i in results]
-
-class TestRegistrySearchView2(RegistryViewTestCase):