r5814 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 gadfly/gadf

commit-gnue
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r5814 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 gadfly/gadf

From:	jcater
Subject:	r5814 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 gadfly/gadfly mysql/mysql odbc/wodbc postgresql/Base postgresql/psycopg
Date:	Thu, 13 May 2004 20:51:08 -0500 (CDT)
Author: jcater
Date: 2004-05-13 20:51:07 -0500 (Thu, 13 May 2004)
New Revision: 5814

Modified:
   trunk/gnue-common/src/datasources/drivers/DBSIG2/Driver.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py
   trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
   trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py
Log:
datadrivers should be looking at Connection._DatabaseError, not 
DataObject._DatabaseError; this was causing problems in forms if a commit 
failed.

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Driver.py  2004-05-14 
00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Driver.py  2004-05-14 
01:51:07 UTC (rev 5814)
@@ -61,7 +61,7 @@
 ##         self._initialData = {}
 ##         self._initialData.update(self._fields)
 
-##     except self._parent._dataObject._DatabaseError, err:
+##     except self._parent._dataObject._connection._DatabaseError, err:
 ##       raise GDataObjects.ConnectionError, err
 
 ##     self._updateFlag = 0
@@ -155,7 +155,7 @@
 
 ##       try:
 ##         rsets = self._cursor.fetchmany()
-##       except self._dataObject._DatabaseError, err:
+##       except self._dataObject._connection._DatabaseError, err:
 ##         raise GDataObjects.ConnectionError, err
 ##       if rsets and len(rsets):
 ##         for rs in(rsets):

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py       
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/RecordSet.py       
2004-05-14 01:51:07 UTC (rev 5814)
@@ -71,7 +71,7 @@
         self._initialData = {}
         self._initialData.update(self._fields)
 
-    except self._parent._dataObject._DatabaseError, err:
+    except self._parent._dataObject._connection._DatabaseError, err:
       raise Exceptions.ConnectionError, err
 
     self._updateFlag = 0

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py       
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py       
2004-05-14 01:51:07 UTC (rev 5814)
@@ -77,7 +77,7 @@
         try:
           # Pass arraysize because of mysql fetchmany bug in MySQLdb < 0.9.2
           rsets = self._cursor.fetchmany (self._cursor.arraysize)
-        except self._dataObject._DatabaseError, err:
+        except self._dataObject._connection._DatabaseError, err:
           raise Exceptions.ConnectionError, err
 
       if rsets and len(rsets):

Modified: trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py       
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/DataObject.py       
2004-05-14 01:51:07 UTC (rev 5814)
@@ -58,7 +58,7 @@
 
       try:
         rsets = self._cursor.fetchall()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         raise GDataObjects.ConnectionError, err
 
       if rsets and len(rsets):

Modified: trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py        
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/RecordSet.py        
2004-05-14 01:51:07 UTC (rev 5814)
@@ -56,7 +56,7 @@
 
       try:
         rsets = self._cursor.fetchall()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         raise GDataObjects.ConnectionError, err
 
       if rsets and len(rsets):

Modified: trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py        
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/gadfly/gadfly/ResultSet.py        
2004-05-14 01:51:07 UTC (rev 5814)
@@ -58,7 +58,7 @@
 
       try:
         rsets = self._cursor.fetchall()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         raise GDataObjects.ConnectionError, err
 
       if rsets and len(rsets):

Modified: trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py     
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py     
2004-05-14 01:51:07 UTC (rev 5814)
@@ -87,7 +87,7 @@
         # See __init__ for details
        rsets = self.fetchBugFix()
 
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         raise GDataObjects.ConnectionError, err
 
       if rsets and len(rsets):

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py  
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py  
2004-05-14 01:51:07 UTC (rev 5814)
@@ -73,7 +73,7 @@
         for key in self._fields.keys():
           self._initialData[key] = self._fields[key]
 
-    except self._parent._dataObject._DatabaseError, err:
+    except self._parent._dataObject._connection._DatabaseError, err:
       raise GDataObjects.ConnectionError, err
 
     self._updateFlag = 0
@@ -195,7 +195,7 @@
 
       try:
         rs = self._cursor.fetchone()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         pass
 # TODO: It seems that popy does what the other drivers don't
 # TODO: and raises this error ALOT need to find out why

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py  
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py  
2004-05-14 01:51:07 UTC (rev 5814)
@@ -70,7 +70,7 @@
         for key in self._fields.keys():
           self._initialData[key] = self._fields[key]
 
-    except self._parent._dataObject._DatabaseError, err:
+    except self._parent._dataObject._connection._DatabaseError, err:
       raise GDataObjects.ConnectionError, err
 
     self._updateFlag = 0
@@ -192,7 +192,7 @@
 
       try:
         rs = self._cursor.fetchone()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         pass
 # TODO: It seems that popy does what the other drivers don't
 # TODO: and raises this error ALOT need to find out why

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py   
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py   
2004-05-14 01:51:07 UTC (rev 5814)
@@ -70,7 +70,7 @@
         for key in self._fields.keys():
           self._initialData[key] = self._fields[key]
 
-    except self._parent._dataObject._DatabaseError, err:
+    except self._parent._dataObject._connection._DatabaseError, err:
       raise GDataObjects.ConnectionError, err
 
     self._updateFlag = 0
@@ -192,7 +192,7 @@
 
       try:
         rs = self._cursor.fetchone()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         pass
 # TODO: It seems that popy does what the other drivers don't
 # TODO: and raises this error ALOT need to find out why

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py   
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py   
2004-05-14 01:51:07 UTC (rev 5814)
@@ -70,7 +70,7 @@
         for key in self._fields.keys():
           self._initialData[key] = self._fields[key]
 
-    except self._parent._dataObject._DatabaseError, err:
+    except self._parent._dataObject._connection._DatabaseError, err:
       raise GDataObjects.ConnectionError, err
 
     self._updateFlag = 0
@@ -192,7 +192,7 @@
 
       try:
         rs = self._cursor.fetchone()
-      except self._dataObject._DatabaseError, err:
+      except self._dataObject._connection._DatabaseError, err:
         pass
 # TODO: It seems that popy does what the other drivers don't
 # TODO: and raises this error ALOT need to find out why

Modified: 
trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py     
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py     
2004-05-14 01:51:07 UTC (rev 5814)
@@ -61,7 +61,10 @@
       self._driver = __import__ (self._driver_module, None, None, '*')
 
     if not hasattr(self,'_DatabaseError'):
-      self._DatabaseError = self._driver.DatabaseError
+      try:
+        self._DatabaseError = self._driver.Error
+      except:
+        self._DatabaseError = self._driver.DatabaseError
 
     GDebug.printMesg(1,"Postgresql database driver initializing")
     try:
@@ -119,22 +122,22 @@
 
 pg_encTable =  {'ascii'     :  'SQL_ASCII',     # ASCII
                 ''          :  'EUC_JP',        # Japanese EUC
-                ''          :  'EUC_CN',       # Chinese EUC
-                ''          :  'EUC_KR',       # Korean EUC
-                ''          :  'JOHAB',                # Korean EUC (Hangle 
base)
-                ''          :  'EUC_TW',       # Taiwan EUC
+                ''          :  'EUC_CN',        # Chinese EUC
+                ''          :  'EUC_KR',        # Korean EUC
+                ''          :  'JOHAB',         # Korean EUC (Hangle base)
+                ''          :  'EUC_TW',        # Taiwan EUC
                 'utf-8'     :  'UNICODE',       # Unicode (UTF-8)
                 ''          :  'MULE_INTERNAL', # Mule internal code
-                'iso8859-1' :  'LATIN1',       # ISO 8859-1 ECMA-94 Latin 
Alphabet No.1
-                'iso8859-2' :  'LATIN2',       # ISO 8859-2 ECMA-94 Latin 
Alphabet No.2
-                'iso8859-3' :  'LATIN3',       # ISO 8859-3 ECMA-94 Latin 
Alphabet No.3
-                'iso8859-4' :  'LATIN4',       # ISO 8859-4 ECMA-94 Latin 
Alphabet No.4
-                'iso8859-9' :  'LATIN5',       # ISO 8859-9 ECMA-128 Latin 
Alphabet No.5
-                'iso8859-10':  'LATIN6',       # ISO 8859-10 ECMA-144 Latin 
Alphabet No.6
-                'iso8859-13':  'LATIN7',       # ISO 8859-13 Latin Alphabet 
No.7
-                'iso8859-14':  'LATIN8',       # ISO 8859-14 Latin Alphabet 
No.8
-                'iso8859-15':  'LATIN9',       # ISO 8859-15 Latin Alphabet 
No.9
-                'iso8859-16':  'LATIN10',      # ISO 8859-16 ASRO SR 14111 
Latin Alphabet No.10
+                'iso8859-1' :  'LATIN1',        # ISO 8859-1 ECMA-94 Latin 
Alphabet No.1
+                'iso8859-2' :  'LATIN2',        # ISO 8859-2 ECMA-94 Latin 
Alphabet No.2
+                'iso8859-3' :  'LATIN3',        # ISO 8859-3 ECMA-94 Latin 
Alphabet No.3
+                'iso8859-4' :  'LATIN4',        # ISO 8859-4 ECMA-94 Latin 
Alphabet No.4
+                'iso8859-9' :  'LATIN5',        # ISO 8859-9 ECMA-128 Latin 
Alphabet No.5
+                'iso8859-10':  'LATIN6',        # ISO 8859-10 ECMA-144 Latin 
Alphabet No.6
+                'iso8859-13':  'LATIN7',        # ISO 8859-13 Latin Alphabet 
No.7
+                'iso8859-14':  'LATIN8',        # ISO 8859-14 Latin Alphabet 
No.8
+                'iso8859-15':  'LATIN9',        # ISO 8859-15 Latin Alphabet 
No.9
+                'iso8859-16':  'LATIN10',       # ISO 8859-16 ASRO SR 14111 
Latin Alphabet No.10
                 'iso8859-5' :  'ISO-8859-5',    # ECMA-113 Latin/Cyrillic
                 'iso8859-6' :  'ISO-8859-6',    # ECMA-114 Latin/Arabic
                 'iso8859-7' :  'ISO-8859-7',    # ECMA-118 Latin/Greek

Modified: trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py      
2004-05-14 00:26:46 UTC (rev 5813)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py      
2004-05-14 01:51:07 UTC (rev 5814)
@@ -38,5 +38,7 @@
 except:
   raise GConnections.DependencyError, ('psycopg', None)
 
+print dir (psycopg)
 class Connection(Base.Connection):
   _driver = psycopg
+#  _DatabaseError = (psycopg.DatabaseError, psycopg.Error, 
psycopg.ProgrammingError)
[Prev in Thread]
Current Thread
[Next in Thread]
r5814 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 gadfly/gadfly mysql/mysql odbc/wodbc postgresql/Base postgresql/psycopg, jcater <=
Prev by Date: r5813 - trunk/gnue-navigator/src
Next by Date: r5815 - trunk/gnue-appserver/samples
Previous by thread: r5813 - trunk/gnue-navigator/src
Next by thread: r5815 - trunk/gnue-appserver/samples
Index(es):
- Date
- Thread