gnue/common/src/dbdrivers cxoracle/DBdriver.py ...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/02/26 19:38:37

Modified files:
        common/src/dbdrivers/cxoracle: DBdriver.py 
        common/src/dbdrivers/oracle: DBdriver.py 

Log message:
        duplicated oracle rowid support into both oracle drivers

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/cxoracle/DBdriver.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/oracle/DBdriver.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/cxoracle/DBdriver.py
diff -c gnue/common/src/dbdrivers/cxoracle/DBdriver.py:1.9 
gnue/common/src/dbdrivers/cxoracle/DBdriver.py:1.10
*** gnue/common/src/dbdrivers/cxoracle/DBdriver.py:1.9  Tue Feb 26 18:07:27 2002
--- gnue/common/src/dbdrivers/cxoracle/DBdriver.py      Tue Feb 26 19:38:37 2002
***************
*** 65,72 ****
      self._DatabaseError = SIG2api.DatabaseError
      self._resultSetClass = Oracle_ResultSet
  
-     self._primaryIdChecked = 0
- 
  
    def connect(self, connectData={}):
      GDebug.printMesg(1,"Oracle database driver initializing")
--- 65,70 ----
***************
*** 86,91 ****
--- 84,91 ----
  
    def __init__(self):
      Oracle_DataObject.__init__(self)
+     self._primaryIdChecked = 0
+ 
  
    def _buildQuery(self, conditions={}):
      return DBSIG_DataObject_Object._buildQuery(self, conditions)
Index: gnue/common/src/dbdrivers/oracle/DBdriver.py
diff -c gnue/common/src/dbdrivers/oracle/DBdriver.py:1.14 
gnue/common/src/dbdrivers/oracle/DBdriver.py:1.15
*** gnue/common/src/dbdrivers/oracle/DBdriver.py:1.14   Thu Jan 17 19:11:28 2002
--- gnue/common/src/dbdrivers/oracle/DBdriver.py        Tue Feb 26 19:38:37 2002
***************
*** 90,98 ****
--- 90,118 ----
  
    def __init__(self):
      Oracle_DataObject.__init__(self)
+     self._primaryIdChecked = 0
+ 
  
    def _buildQuery(self, conditions={}):
      return DBSIG_DataObject_Object._buildQuery(self, conditions)
+ 
+   def _checkForPrimaryId(self):
+ 
+     self._primaryIdChecked = 1
+ 
+     try:
+       statement =  "select rowidtochar(rowid) from %s where 1=2" % self.table
+       cursor = self._dataConnection.cursor()
+       cursor.execute(statement)
+       cursor.close()
+ 
+       self._primaryIdSelect = "ROWIDTOCHAR(ROWID) as GNUE__ROWID__"
+       self._primaryIdField = "gnue__rowid__"  # Keep this lowercase!!!
+       self._primaryIdFormat = "ROWID = CHARTOROWID('%s')"
+       GDebug.printMesg(5,'View %s is using ROWID identifier' % self.table)
+ 
+     except self._DatabaseError:
+       GDebug.printMesg (5, 'View %s has no internal ROWID' % self.table)
  
  
  class Oracle_DataObject_SQL(Oracle_DataObject, \