Changeset 318

Timestamp:

03/20/08 12:30:16 (9 months ago)

Author:

johnbywater

Message:

Fixed domainmodel for SQLObject 0.10.0.

Files:

• trunk/setup.py (modified) (1 diff)
• trunk/src/dm/__init__.py (modified) (1 diff)
• trunk/src/dm/db.py (modified) (18 diffs)
• trunk/src/dm/dom/accesscontrol.py (modified) (3 diffs)
• trunk/src/dm/exceptions.py (modified) (1 diff)

trunk/setup.py

@@ -16 +16 @@
-    # no way to specify the dependency on django as we need a specific revision
-    install_requires = [
->=0.7.1,<=0.7.99'
+==0.10.0
-        'simplejson',
-        # 'Django>=0.95'  # Django not served on cheese shop

trunk/src/dm/__init__.py

@@ -1 @@
-2
+4

trunk/src/dm/db.py

@@ -28 +28 @@
-
-"""
+
+sov = '0.10'
-
-from sqlobject import *
@@ -43 +45 @@
-timepoint = RequiredFeature('Timepoint')
-
-Fals
+Tru
-
-class ConnectionFacade(object):
@@ -252 +254 @@
-                    mapperClass.createTable()
-                except Exception, inst: 
-
+
+
+
+
-                    logger.error(msg)
-                    #raise 
-                    raise Exception, msg
-                else: 
@@ -272 +276 @@
-            if sqlAttribute == None:
-                return
-   # for SQLObject 0.7
+
-                addColumn = mapperClass.sqlmeta.addColumn
+            else:
+                raise ORMError, "No 'addColumn' method on SQLObject sqlmeta."
+            if hasattr(mapperClass.sqlmeta, 'delColumn'):
-                delColumn = mapperClass.sqlmeta.delColumn
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                addColumn(sqlAttribute, changeSchema=True)
-                list(mapperClass.select())
-                msg = "Added %s field to %s table in database." % (
-                    mapperAttribute.dbName,
@@ -409 +424 @@
-        naiveName = self.makeSafeDbName(naiveName)
-        style = self.getSQLStyle()
-
+
+
+
+
-    
-    def makeSafeFieldName(self, naiveName):
-        naiveName = self.makeSafeDbName(naiveName)
-        style = self.getSQLStyle()
-
+
+
+
+
-
-    def makeSafeDbName(self, name):
-        if name.upper() in self.getReservedNames():
-
+.lower()
-            if name != self.makeSafeDbName(name):
-                raise Exception, "Can't make this name safe: %s" % name
@@ -429 +450 @@
-        if hasattr(SQLObject, 'sqlmeta'):  # SQLObject 0.7
-            return SQLObject.sqlmeta.style
-
-
+#
+#
-        else:
-            raise Exception, "Can't find SQLObject style object."
@@ -442 +463 @@
-        self.isUnique = self.dom.isUnique
-        self.isCached = self.dom.isCached
-
-
+
+
+
+
+
+
+
+
-        self.attributesByName = {}
-        self.attributes = []
@@ -477 +504 @@
-        # Set mapper class name from domName, and table attribute from dbName.
-        mapper = self.createClass(self.domName, baseClass, mapperAttributes)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return mapper
-
@@ -541 +566 @@
-        self.dom = metaDomainAttribute
-        self.domName  = self.dom.name
-
+
+
+
+
-        self.dbName = self.makeSafeFieldName(self.dom.dbName or self.dom.name)
-        if self.dom.isValueRef and hasattr(self.dom, 'default'): 
@@ -631 +659 @@
-            return None
-        elif issubclass(self.dom.__class__, dm.dom.meta.DomainObjectRef):
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            raise Exception, "Unknown domain attribute: %s" % self.dom
@@ -646 +679 @@
-    class sqlmeta:
-        cacheValues = True
- 
+
-
-    domainObject = None
@@ -680 +713 @@
-    def assertUnique(self, *args, **kwds):
-        "Raises exception unless no record exists with given parameters."
-
-
+
+
+
+
+
+
-            msg = "'%s' record already exists for: %s" % (self.__name__, kwds)
+            logger.error(msg)
-            raise KforgeDbError, msg
-
@@ -727 +765 @@
-        
-    def getDomainClass(self):
- 
-className = self.getClassName()
+
+domClassName = self.meta.dom.name
-        registry = RequiredFeature('DomainRegistry')
-c
+domC
-
-    def loadDomainObject(self, loadedList, loadMapper=True):
@@ -958 +996 @@
-                    mapper = kwds[metaAttr.domName]
-                    del kwds[metaAttr.domName]
-
-# Todo: Whether this causes the snag in sqlobject>=0.8?
-
-metaAttrD
+
+    dbName = metaAttr.dbName
+elif sov == '0.7':
+    d
-                    if mapper:
-
+
+
+
+
-                    else:
-metaAttrD
+d
-                else:
-                    value = kwds[metaAttr.domName]
@@ -982 +1023 @@
-        for name in kwds:
-            value = kwds[name]
+            if sov == '0.10':
+                if self.meta.dom.attributeNames[name].isDomainObjectRef:
+                    name += '_id'
-            # todo: expand for all database systems
-            sqlSafeValue = sqlrepr(value, 'postgres')
@@ -1039 +1083 @@
-        for name in kwds:
-            value = kwds[name]
+            if sov == '0.10':
+                if self.meta.dom.attributeNames[name].isDomainObjectRef:
+                    name += '_id'
-            # todo: expand for all database systems
-            sqlSafeValue = sqlrepr(value, 'postgres')
@@ -1063 +1110 @@
-        for name in kwds:
-            value = kwds[name]
+            if sov == '0.10' and name != 'id':
+                if self.meta.dom.attributeNames[name].isDomainObjectRef:
+                    name += '_id'
-            # todo: expand for all database systems
-            sqlSafeValue = sqlrepr(value, 'postgres')
@@ -1141 +1191 @@
-                sqlEqualsList.append(sqlEquals)
-            else:
+                if sov == '0.10':
+                    if self.meta.dom.attributeNames[name].isDomainObjectRef:
+                        name += '_id'
-                sqlSafeName = self.makeSqlName(name)
-                sqlEquals = "%s = %s" % (sqlSafeName, sqlSafeValue)

trunk/src/dm/dom/accesscontrol.py

@@ -7 +7 @@
-    "Registered granted permission. Associates a Role and a Permission."
-
-#    isConstant  = True
-    permission  = HasA('Permission')
-    role        = HasA('Role')
@@ -52 +51 @@
-    """
-
-#    isConstant  = True
-    action           = HasA('Action')
-    protectionObject = HasA('ProtectionObject')
@@ -69 +67 @@
-    "Protects a protected object with a protected name."
-
-#    isConstant  = True
-    permissions = AggregatesMany('Permission', 'action')
-

trunk/src/dm/exceptions.py

@@ -4 +4 @@
-
-class DomainModelApplicationError(StandardError): pass
+
+class ORMError(DomainModelApplicationError): pass
-
-class InvalidSystemDictionary(DomainModelApplicationError): pass