Changeset 2681

Timestamp:

01/15/07 07:15:04 (2 years ago)

Author:

ed

Message:

Reverted the changes committed last night until they can be tested and shown to be working for all cases.

Files:

• trunk/dabo/db/dCursorMixin.py (modified) (11 diffs)
• trunk/dabo/db/dbMsSQL.py (modified) (1 diff)
• trunk/dabo/db/dbMySQL.py (modified) (1 diff)
• trunk/dabo/db/dbSQLite.py (modified) (1 diff)

trunk/dabo/db/dCursorMixin.py

@@ -39 +39 @@
-        ##      which we are mixed-in will take the __init__.
-        dObject.__init__(self, *args, **kwargs)
-
+
-        # Just in case this is used outside of the context of a bizobj
-        if not hasattr(self, "superCursor") or self.superCursor is None:
@@ -1032 +1032 @@
-
-
-    def mkParam(self, parmName):
-        # hack alert:
-        # SQLite uses 'named' too, so I am using that in place of ?
-        # because it means the parameter values can be a dict.
-        # and I havn't coded that part yet.  may never need to.
-        # and mysql says 'format' but uses py!
-        # so instead of using what dbapi.paramstyle returns,
-        # each dabo backend has it's own prop to override it.
-        # I hope noone is using 'numeric', 
-        # because I am not sure when to reset the counter.
-        marker = {
-            'qmark': '?',
-            'named': ":"+parmName,
-            'format': "%s",
-            'pyformat': "%("+parmName+")s"
-            }[self.__backend.paramstyle]
-        return marker
-    
-    def appeParm(self, parmName, parmValue, parmList):
-        # hack allert (see mkParam())
-        # this func not called, 
-        # so more untested code:
-        if self.cursor.paramstyle == 'qmark':
-            if not parmList:
-                parmList=()
-        elif self.cursor.paramstyle == 'pyformat':
-            if not parmList:
-                parmList={}
-            self.cursor.paramstyle == "%("+parmName+")s"
-        return parmList
-
-
-    def __saverow(self, row):
-        rec = self._records[row]
@@ -1070 +1038 @@
-        if diff or newrec:
-            if newrec:
-
-
-
+
+
-                kf = self.KeyField
-                for kk, vv in diff.items():
@@ -1087 +1054 @@
-                        continue
-                    # Append the field and its value.
-
-
-
-
-
+
+
+
-                    
+                # Trim leading comma-space from the strings
+                flds = flds[2:]
+                vals = vals[2:]
-                if not flds:
-                    # Some backends (sqlite) require non-empty field clauses. We already
-                    # know that we are expecting the backend to generate the PK, so send
-                    # NULL as the PK Value:
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-            else:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            oldPKVal = rec[self.KeyField]
-            newPKVal = None
@@ -1136 +1089 @@
-            #run the update
-            aux = self.AuxCursor
-,valVals
+
-
-            if newrec and self.AutoPopulatePK and (newPKVal is None):
@@ -1272 +1225 @@
-            res = True
-        else:
-
-
-
+
-            # some backends(PostgreSQL) don't return information about number of deleted rows
-            # try to fetch it before
-(table)s where %(w)s" \
-   % {'table':table, 'w':pkWhere['where'] }
-, pkWhere['parms']
+s where %s" % (self.Table, pkWhere)
+aux = self.AuxCursor
+
-            res = aux.getFieldVal('cnt')
-            if res:
-(table)s where %(w)s" \
-    % {'table':table, 'w':pkWhere['where'] }
-
+s where %s" % (self.Table, pkWhere)
+aux.execute(sql)
+
-
-        if not res:
@@ -1519 +1470 @@
-        return ret
-
+
-    def checkPK(self):
-        """ Verify that the field(s) specified in the KeyField prop exist."""
@@ -1535 +1487 @@
-            raise dException.MissingPKException, _("Primary key field does not exist in the data set: ") + fld
-
+
-    def makePkWhere(self, row=None):
-        """ Create the WHERE clause used for updates, based on the pk field. 
@@ -1558 +1511 @@
-                return rec[fld]
-            
-
-
+
-        for fld in keyFields:
-            fldSafe = bo.encloseSpaces(fld)
-
+
+
-            pkVal = getPkVal(fld)
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    def makeUpdClause(self, diff):
-        """ Create the 'set field=val' section of the Update statement. """
-
-
+
-        bo = self.BackendObject
-        tblPrefix = bo.getUpdateTablePrefix(bo.encloseSpaces(self.Table))
@@ -1581 +1536 @@
-            if fld in self.getNonUpdateFields():
-                continue
-
-
-
-
-
-
-
-
+
+
+
+
-
-
@@ -2035 +1986 @@
-    def _setKeyField(self, kf):
-        if "," in kf:
-        # if True:
-            flds = [f.strip() for f in kf.split(",")]
-            self._keyField = tuple(flds)

trunk/dabo/db/dbMsSQL.py

@@ -11 +11 @@
-        self.dbModuleName = "pymssql"
-        self.useTransactions = True  # this does not appear to be required
-
-
+
-
-

trunk/dabo/db/dbMySQL.py

@@ -21 +21 @@
-    def getConnection(self, connectInfo):
-        import MySQLdb as dbapi
-
-
-
-
+
-        port = connectInfo.Port
-        if not port:

trunk/dabo/db/dbSQLite.py

@@ -14 +14 @@
-            import sqlite3 as dbapi
-        self.dbapi = dbapi
-
-
+
-
-    def getConnection(self, connectInfo):