Changeset 2712

Timestamp:

01/17/07 20:41:49 (2 years ago)

Author:

carl

Message:

parameterized the SQL commands.
pyformat is the default.
if the back end uses something else, override in the backend class.

Files:

• branches/carl2/dabo/db/dBackend.py (modified) (3 diffs)
• branches/carl2/dabo/db/dCursorMixin.py (modified) (13 diffs)
• branches/carl2/dabo/db/dbFirebird.py (modified) (2 diffs)
• branches/carl2/dabo/db/dbSQLite.py (modified) (1 diff)

branches/carl2/dabo/db/dBackend.py

@@ -38 +38 @@
-            self._encoding = dabo.defaultEncoding
-
+        self.emptyParamValues = {}
+
+    def mkMarker(self, key):
+        return '%('+key+')s'
+
+    def addParam(self, paramList, key, value):
+        paramList[key] = value
+        return paramList
-
-    def isValidModule(self):
@@ -268 +276 @@
-            exp = "%(exp)s as %(alias)s" % locals()
-        indent = len("select ") * " "
-        # Give the backend-specific code a chance to update the format
-        exp = self.processFields(exp)
-        return self.addWithSep(clause, exp, sep=",\n%s" % indent)
-
-
+
-    def addFrom(self, clause, exp):
-        """ Add a table to the sql statement."""
@@ -283 +289 @@
-        """ Add an expression to the where clause."""
-        indent = (len("select ") - len(comp)) * " "
-        exp = self.processFields(exp)
-        return self.addWithSep(clause, exp, sep="\n%s%s " % (indent, comp))
-

branches/carl2/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:
@@ -218 +218 @@
-        #### NOTE: NEEDS TO BE TESTED THOROUGHLY!!!!  ####
-
-   
+
-        if not isinstance(sql, unicode):
-            sql = unicode(sql, self.Encoding)
@@ -234 +234 @@
-                res = self.superCursor.execute(self, sqlEX)
-            else:
-
+   
-        except Exception, e:
-            # If this is due to a broken connection, let the user know.
@@ -1030 +1030 @@
-        if useTransaction:
-            self.commitTransaction()
-
-
+
-    def __saverow(self, row):
-        rec = self._records[row]
@@ -1038 +1037 @@
-        if diff or newrec:
-            if newrec:
-
-
+
+
+
+
+
-                kf = self.KeyField
-                for kk, vv in diff.items():
@@ -1053 +1055 @@
-                        # Skip it.
-                        continue
-
-
-
-
+
+
+
+
+
-                    
-                # 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
@@ -1089 +1102 @@
-            #run the update
-            aux = self.AuxCursor
-
+,params
-
-            if newrec and self.AutoPopulatePK and (newPKVal is None):
@@ -1225 +1238 @@
-            res = True
-        else:
-
+
+
+
+
+
+
+
-            # some backends(PostgreSQL) don't return information about number of deleted rows
-            # try to fetch it before
-s where %s" % (self.Table, pkWhere)
-aux = self.AuxCursor
-
+(table)s where %(w)s" \
+   % {'table':table, 'w':pkWhere }
+, params
-            res = aux.getFieldVal('cnt')
-            if res:
-s where %s" % (self.Table, pkWhere)
-aux.execute(sql)
-
+(table)s where %(w)s" \
+    % {'table':table, 'w':pkWhere }
+
-
-        if not res:
@@ -1470 +1489 @@
-        return ret
-
-
-    def checkPK(self):
-        """ Verify that the field(s) specified in the KeyField prop exist."""
@@ -1487 +1505 @@
-            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. 
@@ -1511 +1528 @@
-                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. """
-        ret = ""
-        bo = self.BackendObject
+        sets = []
+        params = bo.emptyParamValues
-        tblPrefix = bo.getUpdateTablePrefix(bo.encloseSpaces(self.Table))
-        for fld, val in diff.items():
@@ -1536 +1552 @@
-            if fld in self.getNonUpdateFields():
-                continue
-
-
-
-
-
+
+
+
+
+
+
-
-    def processFields(self, txt):
@@ -1986 +2003 @@
-    def _setKeyField(self, kf):
-        if "," in kf:
+        # if True:
-            flds = [f.strip() for f in kf.split(",")]
-            self._keyField = tuple(flds)

branches/carl2/dabo/db/dbFirebird.py

@@ -16 +16 @@
-        self.dbapi = kinterbasdb
-
+        self.emptyParamValues = ()
+
+    def addParam(self, paramList, key, value):
+        paramList = list( paramList)
+        paramList.append(value)
+        parmList = tuple(paramList)
+        marker = '?'
+        return (paramList,marker)
-
-    def getConnection(self, connectInfo):
@@ -31 +39 @@
-        return self._connection
-        
-        
-    def getDictCursorClass(self):
-        return self.dbapi.Cursor
-        
-    
-    def noResultsOnSave(self):

branches/carl2/dabo/db/dbSQLite.py

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