r5013 - in trunk/gnue-common/src/datasources/drivers: adodbapi/Schema/Discovery adodbapi/adodbapi interbase/interbase

[btami]

Author: btami
Date: 2003-12-20 13:51:43 -0600 (Sat, 20 Dec 2003)
New Revision: 5013

Modified:
   
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py
   trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
Log:
fixed adodbapi dbdriver

Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
===================================================================
--- 
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
        2003-12-20 01:40:56 UTC (rev 5012)
+++ 
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
        2003-12-20 19:51:43 UTC (rev 5013)
@@ -28,14 +28,31 @@
 
 __all__ = ['Introspection']
 
+import adodbapi
+
 import string
 from string import lower, join, split
 import sys
 
 from gnue.common.apps import GDebug, GConfig
-from gnue.common.apps import GDebug, GConfig
 from gnue.common.datasources import GIntrospection
 
+DESCRIPTION_NAME            = 0
+DESCRIPTION_TYPE_CODE       = 1
+DESCRIPTION_DISPLAY_SIZE    = 2
+DESCRIPTION_INTERNAL_SIZE   = 3
+DESCRIPTION_PRECISION       = 4
+DESCRIPTION_SCALE           = 5
+DESCRIPTION_NULL_OK         = 6
+
+TABLE_CATALOG = 0
+TABLE_SCHEMA = 1 
+TABLE_NAME = 2
+TABLE_TYPE = 3
+
+adSchemaTables = 20
+
+
 class Introspection(GIntrospection.Introspection):
 
   # list of the types of Schema objects this driver provides
@@ -69,7 +86,7 @@
   # Return a list of Schema objects
   def getSchemaList(self, type=None):
     QueryType = adSchemaTables
-    rs = self._connection.native.OpenSchema(QueryType)
+    rs = self._connection.native.adoConn.OpenSchema(QueryType)
 
     rs.MoveFirst()
     tables = []
@@ -124,11 +141,11 @@
                  'required': d[DESCRIPTION_NULL_OK]==0,
                  'length': d[DESCRIPTION_INTERNAL_SIZE]}
 
-      if nativetype == SIG2api.NUMBER:
+      if nativetype == adodbapi.NUMBER:
         attrs['datatype']='number'
         attrs['precision']=d[DESCRIPTION_SCALE]
         attrs['length']=d[DESCRIPTION_PRECISION]
-      elif nativetype == SIG2api.DATETIME:
+      elif nativetype == adodbapi.DATETIME:
         attrs['datatype']='date'
       else:
         attrs['datatype']='text'

Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py   
2003-12-20 01:40:56 UTC (rev 5012)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/DataObject.py   
2003-12-20 19:51:43 UTC (rev 5013)
@@ -27,7 +27,7 @@
 # NOTES:
 #
 
-__all__ = ['DataObject']
+__all__ = ['DataObject_SQL','DataObject_Object']
 
 from gnue.common.datasources import GDataObjects, GConditions, GConnections
 from gnue.common.apps import GDebug

Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py     
2003-12-20 01:40:56 UTC (rev 5012)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py     
2003-12-20 19:51:43 UTC (rev 5013)
@@ -56,6 +56,6 @@
 # This greatly helps with error messages.
 #
 def Connection(*args, **parms):
-  from Driver import Connection as C
+  from Connection import Connection as C
   return C(*args, **parms)
 

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py 
2003-12-20 01:40:56 UTC (rev 5012)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py 
2003-12-20 19:51:43 UTC (rev 5013)
@@ -1,3 +1,4 @@
+
 #
 # This file is part of GNU Enterprise.
 #
@@ -27,7 +28,9 @@
 #
 # NOTES:
 
+__all__ = ['DataObject_SQL','DataObject_Object']
 
+
 import sys
 from gnue.common.datasources import GDataObjects
 from gnue.common.apps import GDebug

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py   
2003-12-20 01:40:56 UTC (rev 5012)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py   
2003-12-20 19:51:43 UTC (rev 5013)
@@ -19,6 +19,9 @@
 # Copyright 2000-2003 Free Software Foundation
 #
 
+__all__ = ['Connection']
+
+
 __description__ = _("Interbase Data Driver")
 __driverurl__ = "http://kinterbasdb.sourceforge.net";
 __examples__ = ""