[gnue] r7179 - trunk/gnue-common/src/datasources/drivers/DBSIG2

[reinhard]

Author: reinhard
Date: 2005-03-11 17:01:01 -0600 (Fri, 11 Mar 2005)
New Revision: 7179

Modified:
   trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py
Log:
Implemented _requery function for DBSIG2 drivers.


Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-03-11 22:55:35 UTC (rev 7178)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-03-11 23:01:01 UTC (rev 7179)
@@ -450,6 +450,21 @@
 
   # ---------------------------------------------------------------------------
 
+  def _requery (self, table, oldfields, fields):
+    (where, parameters) = self.__where (oldfields)
+    statement = "SELECT %s FROM %s WHERE %s" % (string.join (fields, ', '),
+                                                table, where)
+    try:
+      list = self.sql (statement, parameters) [0]
+    except self._driver.DatabaseError:
+      raise Exceptions.ConnectionError, errors.getException () [2]
+    result = {}
+    for i in range (len (fields)):
+      result [fields [i]] = list [i]
+    return result
+
+  # ---------------------------------------------------------------------------
+
   def _commit (self):
     try:
       self.native.commit ()

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py       
2005-03-11 22:55:35 UTC (rev 7178)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py       
2005-03-11 23:01:01 UTC (rev 7179)
@@ -36,29 +36,4 @@
 #
 #
 class RecordSet(Base.RecordSet):
-
-  def _requery(self):
-    """
-    Requery a posted record to capture any changes made by the database
-    """
-    return  # TODO: Will test tomorrow
-
-    do = self._parent._dataObject
-    if not do.primarykey or not do._fieldReferences or \
-       self._fields.get(key,None) is None :
-      return False
-    fields = self._fieldReferences.keys()
-    where = []
-    for key in do.primarykeys.split(','):
-      where.append("%s=%s"%(key,do._toSqlString(self._fields[key])))
-    select = "SELECT %s FROM %s WHERE %s" % (
-            join(fields,','), do.table, join(where,' and '))
-    print select
-    try:
-      cursor = self._connection.makecursor(select)
-      f = cursor.fetchone()
-      for i in range(len(f)):
-        self.setField(fields[i], f[i], False)
-    except do._connection._DatabaseError, err:
-      raise Exceptions.ConnectionError, errors.getException () [2]
-    return True
+  pass