commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue/common/src datasources/GConnections.py dat...


From: Jason Cater
Subject: gnue/common/src datasources/GConnections.py dat...
Date: Tue, 18 Feb 2003 14:35:02 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/02/18 14:35:01

Modified files:
        common/src/datasources: GConnections.py 
        common/src/datasources/drivers/appserver: __init__.py 
        common/src/datasources/drivers/db2/db2: Driver.py 
        common/src/datasources/drivers/gadfly/gadfly: Driver.py 
        common/src/datasources/drivers/informix/informix: Driver.py 
        common/src/datasources/drivers/ingres/ingres: Driver.py 
        common/src/datasources/drivers/interbase/interbase: Driver.py 
        common/src/datasources/drivers/odbc/mxodbc: Driver.py 
        common/src/datasources/drivers/oracle/cxoracle: Driver.py 
        common/src/datasources/drivers/oracle/dcoracle: Driver.py 
        common/src/datasources/drivers/postgresql/Base: Driver.py 
        common/src/datasources/drivers/postgresql/popy: Driver.py 
        common/src/datasources/drivers/postgresql/psycopg: Driver.py 
        common/src/datasources/drivers/postgresql/pygresql: Driver.py 
        common/src/datasources/drivers/postgresql/pypgsql: Driver.py 
        common/src/datasources/drivers/sapdb/sapbd: Driver.py 
        common/src/datasources/drivers/sqlite/sqlite: Driver.py 
        common/src/datasources/drivers/sqlrelay/sqlrelay: Driver.py 
        common/src/datasources/drivers/sybase/sybase: Driver.py 
Removed files:
        common/src/dbdrivers: __init__.py 
        common/src/dbdrivers/_dbsig: DBdriver.py __init__.py 
        common/src/dbdrivers/_empty: DBdriver.py __init__.py 
        common/src/dbdrivers/_oracle: DBdriver.py __init__.py 
        common/src/dbdrivers/_pgsql: DBdriver.py __init__.py 
        common/src/dbdrivers/_static: DBdriver.py __init__.py 
        common/src/dbdrivers/appserver: DBdriver.py __init__.py 
        common/src/dbdrivers/configfile: DBdriver.py __init__.py 
        common/src/dbdrivers/cxoracle: DBdriver.py __init__.py 
        common/src/dbdrivers/db2: DBdriver.py __init__.py 
        common/src/dbdrivers/dbf: DBdriver.py __init__.py dbf.py 
        common/src/dbdrivers/gadfly: DBdriver.py __init__.py 
        common/src/dbdrivers/geas: DBdriver.py __init__.py 
        common/src/dbdrivers/informix: DBdriver.py __init__.py 
        common/src/dbdrivers/ingres: DBdriver.py __init__.py 
        common/src/dbdrivers/interbase: DBdriver.py __init__.py 
        common/src/dbdrivers/msado: DBdriver.py __init__.py 
        common/src/dbdrivers/mxodbc: DBdriver.py __init__.py 
        common/src/dbdrivers/mysql: DBdriver.py __init__.py 
        common/src/dbdrivers/odbc: DBdriver.py __init__.py 
        common/src/dbdrivers/odbc-db2: DBdriver.py __init__.py 
        common/src/dbdrivers/oracle: DBdriver.py __init__.py 
        common/src/dbdrivers/popy: DBdriver.py __init__.py 
        common/src/dbdrivers/postgresql: DBdriver.py __init__.py 
        common/src/dbdrivers/psycopg: DBdriver.py __init__.py 
        common/src/dbdrivers/pypgsql: DBdriver.py __init__.py 
        common/src/dbdrivers/sapdb: DBdriver.py __init__.py 
        common/src/dbdrivers/sqlite: DBdriver.py __init__.py 
        common/src/dbdrivers/sqlrelay: DBdriver.py __init__.py 
        common/src/dbdrivers/sybase: DBdriver.py __init__.py 

Log message:
        changes needed to get new datasource driver structure to load

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/GConnections.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/appserver/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/db2/db2/Driver.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/gadfly/gadfly/Driver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/informix/informix/Driver.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/ingres/ingres/Driver.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/interbase/interbase/Driver.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/odbc/mxodbc/Driver.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/oracle/cxoracle/Driver.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/oracle/dcoracle/Driver.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/postgresql/Base/Driver.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/postgresql/popy/Driver.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/postgresql/psycopg/Driver.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/postgresql/pygresql/Driver.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/postgresql/pypgsql/Driver.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/sapdb/sapbd/Driver.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/sqlite/sqlite/Driver.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/sqlrelay/sqlrelay/Driver.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/drivers/sybase/sybase/Driver.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/common/src/datasources/GConnections.py
diff -c gnue/common/src/datasources/GConnections.py:1.50 
gnue/common/src/datasources/GConnections.py:1.51
*** gnue/common/src/datasources/GConnections.py:1.50    Tue Feb 18 09:59:23 2003
--- gnue/common/src/datasources/GConnections.py Tue Feb 18 14:34:58 2003
***************
*** 35,42 ****
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
  from gnue.common.datasources import GLoginHandler
  from gnue.common.utils.FileUtils import openResource, dyn_import
- 
  class Error(StandardError):
    # Base error
    pass
--- 35,42 ----
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
  from gnue.common.datasources import GLoginHandler
+ from gnue.common.datasources.drivers import DRIVERS as ALLDRIVERS
  from gnue.common.utils.FileUtils import openResource, dyn_import
  class Error(StandardError):
    # Base error
    pass
***************
*** 190,196 ****
      # connection name is specified.  The calling method should
      # catch this exception and handle it properly (exit w/message)
      return _load_dbdriver(
!        self.getConnectionParameters(connection_name), 
         connection_type, self)
  
  
--- 190,196 ----
      # connection name is specified.  The calling method should
      # catch this exception and handle it properly (exit w/message)
      return _load_dbdriver(
!        self.getConnectionParameters(connection_name),
         connection_type, self)
  
  
***************
*** 326,332 ****
            except GLoginHandler.UserCanceledLogin:
              # Guess they changed their minds. Treat as a login error.
              self._loginHandler.destroyLoginDialog()
!             tmsg = _("User canceled the login request.") 
              raise GDataObjects.LoginError, tmsg
  
    def getAuthenticatedUser(self, connection=None):
--- 326,332 ----
            except GLoginHandler.UserCanceledLogin:
              # Guess they changed their minds. Treat as a login error.
              self._loginHandler.destroyLoginDialog()
!             tmsg = _("User canceled the login request.")
              raise GDataObjects.LoginError, tmsg
  
    def getAuthenticatedUser(self, connection=None):
***************
*** 345,361 ****
  #
  def _load_dbdriver(parameters, type, connectionManager):
  
!   driver = parameters['provider'].replace('/','.')
!   behavior = parameters.get('behavior','').replace('/','.')
!   
!   dbdriver = _try_dbdriver(driver)
!   if not dbdriver: 
!     dbdriver = _try_dbdriver(driver, root=1)
!     
!   if not dbdriver:       
      tmsg = _("No database driver found for provider type '%s'") % driver
      raise GDataObjects.ProviderNotSupportedError, tmsg
!   
    try:
      dd = dbdriver.supportedDataObjects[type]()
      GDebug.printMesg (1,'Attaching to %s (%s)' % 
(driver,dd.__class__.__name__))
--- 345,375 ----
  #
  def _load_dbdriver(parameters, type, connectionManager):
  
! 
!   driver = parameters['provider'].lower().replace('/','.')
!   behavior = parameters.get('behavior','').lower().replace('/','.')
! 
!   d = driver.split('.')
!   basedriver = d[0]
!   if len(d) > 1:
!     extradriver = "." + string.join(d[1:],'.')
!   else:
!     extradriver = ""
! 
!   path = []
! 
!   dbdriver = None
! 
!   basemodule = _find_base_driver(basedriver, ALLDRIVERS)
!   GDebug.printMesg(1,'Using %s as base driver for %s' %  (basemodule, driver))
! 
!   if basemodule:
!     dbdriver = _get_dbdriver(basemodule + extradriver)
! 
!   if not dbdriver:
      tmsg = _("No database driver found for provider type '%s'") % driver
      raise GDataObjects.ProviderNotSupportedError, tmsg
! 
    try:
      dd = dbdriver.supportedDataObjects[type]()
      GDebug.printMesg (1,'Attaching to %s (%s)' % 
(driver,dd.__class__.__name__))
***************
*** 364,392 ****
      tmsg = _("DB Driver '%s' does not support source type '%s'") % (driver, 
type)
      raise GDataObjects.ObjectTypeNotAvailableError, tmsg
  
!     
! def _try_dbdriver (driver, prefix="", root=0 ): 
    dbdriver = None
!   if not root: 
!     driv = "." + prefix + driver
!   else: 
!     driv = ""
!   
    try:
!     print "gnue.common.datasources.drivers%s.Driver" % (driv)
!     dbdriver = dyn_import("gnue.common.datasources.drivers.%s.Driver" % 
(driv))
!   except ImportError, err:
!     GDebug.printMesg(1,'%s%s is not a dbdriver' % (prefix, driver))
!     GDebug.printMesg(1,err)
!     try: 
!       print "gnue.common.datasources.drivers%s.DRIVERS" % (driv)
!       drivers = dyn_import("gnue.common.datasources.drivers%s" % 
(driv)).DRIVERS
!       for d in drivers:  
!         dbdriver = _try_dbdriver(driver, prefix + d + "." )
!         if dbdriver: break
!     except ImportError: 
        GDebug.printMesg(1,'%s does not contain dbdrivers' % (driver))
-       GDebug.printMesg(1,err)
  
    return dbdriver
!           
--- 378,414 ----
      tmsg = _("DB Driver '%s' does not support source type '%s'") % (driver, 
type)
      raise GDataObjects.ObjectTypeNotAvailableError, tmsg
  
! 
! def _find_base_driver (driver, modules, path=[]):
!   if driver in modules:
!     return 'gnue.common.datasources.drivers.' + string.join(path + 
[driver],'.')
!   else:
!     for module in modules:
!       try:
!         m = dyn_import ('gnue.common.datasources.drivers.' + string.join(path 
+ [module],'.')).DRIVERS
!         rs = _find_base_driver(driver, m, path + [module])
!         if rs:
!           return rs
!       except (AttributeError, ImportError), err:
!         pass
!         ##print "Not in " + 'gnue.common.datasources.drivers.' + 
string.join(path + [module],'.')
! 
! 
! def _get_dbdriver (driver):
    dbdriver = None
! 
    try:
!     dbdriver = dyn_import("%s.Driver" % (driver))
!   except:
!     GDebug.printMesg(1,'%s is not a dbdriver' % ( driver))
!     try:
!       drivers = dyn_import("%s" % (driver)).DRIVERS
!       for d in drivers:
!         dbdriver = _get_dbdriver(driver + "." + d )
!         if dbdriver:
!           return dbdriver
!     except (ImportError, AttributeError):
        GDebug.printMesg(1,'%s does not contain dbdrivers' % (driver))
  
    return dbdriver
! 
Index: gnue/common/src/datasources/drivers/appserver/__init__.py
diff -c gnue/common/src/datasources/drivers/appserver/__init__.py:1.2 
gnue/common/src/datasources/drivers/appserver/__init__.py:1.3
*** gnue/common/src/datasources/drivers/appserver/__init__.py:1.2       Tue Feb 
18 09:59:24 2003
--- gnue/common/src/datasources/drivers/appserver/__init__.py   Tue Feb 18 
14:34:58 2003
***************
*** 1 ****
! appserver
--- 1 ----
! DRIVERS=['appserver']
Index: gnue/common/src/datasources/drivers/db2/db2/Driver.py
diff -c gnue/common/src/datasources/drivers/db2/db2/Driver.py:1.18 
gnue/common/src/datasources/drivers/db2/db2/Driver.py:1.19
*** gnue/common/src/datasources/drivers/db2/db2/Driver.py:1.18  Tue Feb 18 
09:59:24 2003
--- gnue/common/src/datasources/drivers/db2/db2/Driver.py       Tue Feb 18 
14:34:58 2003
***************
*** 40,46 ****
  from gnue.forms.GFError import DBError
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 40,46 ----
  from gnue.forms.GFError import DBError
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/gadfly/gadfly/Driver.py
diff -c gnue/common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.7 
gnue/common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.8
*** gnue/common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.7     Tue Feb 
18 09:59:24 2003
--- gnue/common/src/datasources/drivers/gadfly/gadfly/Driver.py Tue Feb 18 
14:34:58 2003
***************
*** 33,39 ****
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 33,39 ----
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/informix/informix/Driver.py
diff -c gnue/common/src/datasources/drivers/informix/informix/Driver.py:1.11 
gnue/common/src/datasources/drivers/informix/informix/Driver.py:1.12
*** gnue/common/src/datasources/drivers/informix/informix/Driver.py:1.11        
Tue Feb 18 09:59:24 2003
--- gnue/common/src/datasources/drivers/informix/informix/Driver.py     Tue Feb 
18 14:34:59 2003
***************
*** 40,46 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 40,46 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/ingres/ingres/Driver.py
diff -c gnue/common/src/datasources/drivers/ingres/ingres/Driver.py:1.12 
gnue/common/src/datasources/drivers/ingres/ingres/Driver.py:1.13
*** gnue/common/src/datasources/drivers/ingres/ingres/Driver.py:1.12    Tue Feb 
18 09:59:24 2003
--- gnue/common/src/datasources/drivers/ingres/ingres/Driver.py Tue Feb 18 
14:34:59 2003
***************
*** 41,47 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 41,47 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/interbase/interbase/Driver.py
diff -c gnue/common/src/datasources/drivers/interbase/interbase/Driver.py:1.16 
gnue/common/src/datasources/drivers/interbase/interbase/Driver.py:1.17
*** gnue/common/src/datasources/drivers/interbase/interbase/Driver.py:1.16      
Tue Feb 18 09:59:24 2003
--- gnue/common/src/datasources/drivers/interbase/interbase/Driver.py   Tue Feb 
18 14:34:59 2003
***************
*** 39,45 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 39,45 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/odbc/mxodbc/Driver.py
diff -c gnue/common/src/datasources/drivers/odbc/mxodbc/Driver.py:1.10 
gnue/common/src/datasources/drivers/odbc/mxodbc/Driver.py:1.11
*** gnue/common/src/datasources/drivers/odbc/mxodbc/Driver.py:1.10      Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/odbc/mxodbc/Driver.py   Tue Feb 18 
14:34:59 2003
***************
*** 41,47 ****
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
  from gnue.common.utils.FileUtils import dyn_import
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 41,47 ----
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
  from gnue.common.utils.FileUtils import dyn_import
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/oracle/cxoracle/Driver.py
diff -c gnue/common/src/datasources/drivers/oracle/cxoracle/Driver.py:1.18 
gnue/common/src/datasources/drivers/oracle/cxoracle/Driver.py:1.19
*** gnue/common/src/datasources/drivers/oracle/cxoracle/Driver.py:1.18  Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/oracle/cxoracle/Driver.py       Tue Feb 
18 14:34:59 2003
***************
*** 35,45 ****
  import sys, string
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects, GConnections
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
! from gnue.common.drivers.oracle.Base.Driver import Oracle_Schema
  
  try:
    import cx_Oracle as SIG2api
--- 35,45 ----
  import sys, string
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects, GConnections
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
! from gnue.common.datasources.drivers.oracle.Base.Driver import Oracle_Schema
  
  try:
    import cx_Oracle as SIG2api
Index: gnue/common/src/datasources/drivers/oracle/dcoracle/Driver.py
diff -c gnue/common/src/datasources/drivers/oracle/dcoracle/Driver.py:1.22 
gnue/common/src/datasources/drivers/oracle/dcoracle/Driver.py:1.23
*** gnue/common/src/datasources/drivers/oracle/dcoracle/Driver.py:1.22  Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/oracle/dcoracle/Driver.py       Tue Feb 
18 14:34:59 2003
***************
*** 36,46 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
! from gnue.common.drivers.oracle.Base.Driver import Oracle_Schema
  
  try:
    import DCOracle2 as SIG2api
--- 36,46 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
! from gnue.common.datasources.drivers.oracle.Base.Driver import Oracle_Schema
  
  try:
    import DCOracle2 as SIG2api
Index: gnue/common/src/datasources/drivers/postgresql/Base/Driver.py
diff -c gnue/common/src/datasources/drivers/postgresql/Base/Driver.py:1.29 
gnue/common/src/datasources/drivers/postgresql/Base/Driver.py:1.30
*** gnue/common/src/datasources/drivers/postgresql/Base/Driver.py:1.29  Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/postgresql/Base/Driver.py       Tue Feb 
18 14:34:59 2003
***************
*** 33,43 ****
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject
  
! from gnue.common.drivers.DBSIG2.Driver import DBSIG_DataObject_Object as 
PGSQL_DataObject_Object
! from gnue.common.drivers.DBSIG2.Driver import DBSIG_DataObject_SQL as 
PGSQL_DataObject_SQL
  
  
  class PGSQL_RecordSet(DBSIG_RecordSet):
--- 33,43 ----
  import sys
  from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataObjects
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject
  
! from gnue.common.datasources.drivers.DBSIG2.Driver import 
DBSIG_DataObject_Object as PGSQL_DataObject_Object
! from gnue.common.datasources.drivers.DBSIG2.Driver import 
DBSIG_DataObject_SQL as PGSQL_DataObject_SQL
  
  
  class PGSQL_RecordSet(DBSIG_RecordSet):
Index: gnue/common/src/datasources/drivers/postgresql/popy/Driver.py
diff -c gnue/common/src/datasources/drivers/postgresql/popy/Driver.py:1.16 
gnue/common/src/datasources/drivers/postgresql/popy/Driver.py:1.17
*** gnue/common/src/datasources/drivers/postgresql/popy/Driver.py:1.16  Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/postgresql/popy/Driver.py       Tue Feb 
18 14:34:59 2003
***************
*** 1,19 ****
  #
  # This file is part of GNU Enterprise.
  #
! # GNU Enterprise is free software; you can redistribute it 
! # and/or modify it under the terms of the GNU General Public 
! # License as published by the Free Software Foundation; either 
  # version 2, or(at your option) any later version.
  #
! # GNU Enterprise is distributed in the hope that it will be 
! # useful, but WITHOUT ANY WARRANTY; without even the implied 
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  # PURPOSE. See the GNU General Public License for more details.
  #
! # You should have received a copy of the GNU General Public 
! # License along with program; see the file COPYING. If not, 
! # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  # Copyright 2000-2003 Free Software Foundation
--- 1,19 ----
  #
  # This file is part of GNU Enterprise.
  #
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
  # version 2, or(at your option) any later version.
  #
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  # PURPOSE. See the GNU General Public License for more details.
  #
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  # Copyright 2000-2003 Free Software Foundation
***************
*** 31,37 ****
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  
! from gnue.common.dbdrivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
          PGSQL_TriggerExtensions
--- 31,37 ----
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  
! from gnue.common.datasources.drivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
          PGSQL_TriggerExtensions
Index: gnue/common/src/datasources/drivers/postgresql/psycopg/Driver.py
diff -c gnue/common/src/datasources/drivers/postgresql/psycopg/Driver.py:1.15 
gnue/common/src/datasources/drivers/postgresql/psycopg/Driver.py:1.16
*** gnue/common/src/datasources/drivers/postgresql/psycopg/Driver.py:1.15       
Tue Feb 18 09:59:25 2003
--- gnue/common/src/datasources/drivers/postgresql/psycopg/Driver.py    Tue Feb 
18 14:34:59 2003
***************
*** 1,19 ****
  #
  # This file is part of GNU Enterprise.
  #
! # GNU Enterprise is free software; you can redistribute it 
! # and/or modify it under the terms of the GNU General Public 
! # License as published by the Free Software Foundation; either 
  # version 2, or(at your option) any later version.
  #
! # GNU Enterprise is distributed in the hope that it will be 
! # useful, but WITHOUT ANY WARRANTY; without even the implied 
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  # PURPOSE. See the GNU General Public License for more details.
  #
! # You should have received a copy of the GNU General Public 
! # License along with program; see the file COPYING. If not, 
! # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  # Copyright 2000-2003 Free Software Foundation
--- 1,19 ----
  #
  # This file is part of GNU Enterprise.
  #
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
  # version 2, or(at your option) any later version.
  #
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  # PURPOSE. See the GNU General Public License for more details.
  #
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  # Copyright 2000-2003 Free Software Foundation
***************
*** 22,28 ****
  # psycopg/DBdriver.py
  #
  # DESCRIPTION:
! # Postgresql implementation of dbdriver using Python DB-SIG v2 
  # specification.
  #
  # NOTES:
--- 22,28 ----
  # psycopg/DBdriver.py
  #
  # DESCRIPTION:
! # Postgresql implementation of dbdriver using Python DB-SIG v2
  # specification.
  #
  # NOTES:
***************
*** 35,41 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.dbdrivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
            PGSQL_TriggerExtensions
--- 35,41 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
            PGSQL_TriggerExtensions
Index: gnue/common/src/datasources/drivers/postgresql/pygresql/Driver.py
diff -c gnue/common/src/datasources/drivers/postgresql/pygresql/Driver.py:1.38 
gnue/common/src/datasources/drivers/postgresql/pygresql/Driver.py:1.39
*** gnue/common/src/datasources/drivers/postgresql/pygresql/Driver.py:1.38      
Tue Feb 18 09:59:25 2003
--- gnue/common/src/datasources/drivers/postgresql/pygresql/Driver.py   Tue Feb 
18 14:34:59 2003
***************
*** 1,14 ****
  #
  # This file is part of GNU Enterprise.
  #
! # GNU Enterprise is free software; you can redistribute it 
! # and/or modify it under the terms of the GNU General Public 
! # License as published by the Free Software Foundation; either 
  # version 2, or(at your option) any later version.
  #
! # GNU Enterprise is distributed in the hope that it will be 
! # useful, but WITHOUT ANY WARRANTY; without even the implied 
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  # PURPOSE. See the GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public
--- 1,14 ----
  #
  # This file is part of GNU Enterprise.
  #
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
  # version 2, or(at your option) any later version.
  #
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  # PURPOSE. See the GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public
***************
*** 31,37 ****
  
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.dbdrivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
            PGSQL_TriggerExtensions
--- 31,37 ----
  
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
            PGSQL_TriggerExtensions
Index: gnue/common/src/datasources/drivers/postgresql/pypgsql/Driver.py
diff -c gnue/common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.29 
gnue/common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.30
*** gnue/common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.29       
Tue Feb 18 09:59:25 2003
--- gnue/common/src/datasources/drivers/postgresql/pypgsql/Driver.py    Tue Feb 
18 14:34:59 2003
***************
*** 31,37 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.dbdrivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
            PGSQL_TriggerExtensions
--- 31,37 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.postgresql.Base.Driver \
     import PGSQL_RecordSet, PGSQL_ResultSet, PGSQL_DataObject, \
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
            PGSQL_TriggerExtensions
Index: gnue/common/src/datasources/drivers/sapdb/sapbd/Driver.py
diff -c gnue/common/src/datasources/drivers/sapdb/sapbd/Driver.py:1.16 
gnue/common/src/datasources/drivers/sapdb/sapbd/Driver.py:1.17
*** gnue/common/src/datasources/drivers/sapdb/sapbd/Driver.py:1.16      Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/sapdb/sapbd/Driver.py   Tue Feb 18 
14:34:59 2003
***************
*** 59,65 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 59,65 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/sqlite/sqlite/Driver.py
diff -c gnue/common/src/datasources/drivers/sqlite/sqlite/Driver.py:1.8 
gnue/common/src/datasources/drivers/sqlite/sqlite/Driver.py:1.9
*** gnue/common/src/datasources/drivers/sqlite/sqlite/Driver.py:1.8     Tue Feb 
18 09:59:25 2003
--- gnue/common/src/datasources/drivers/sqlite/sqlite/Driver.py Tue Feb 18 
14:34:59 2003
***************
*** 37,43 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 37,43 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/sqlrelay/sqlrelay/Driver.py
diff -c gnue/common/src/datasources/drivers/sqlrelay/sqlrelay/Driver.py:1.10 
gnue/common/src/datasources/drivers/sqlrelay/sqlrelay/Driver.py:1.11
*** gnue/common/src/datasources/drivers/sqlrelay/sqlrelay/Driver.py:1.10        
Tue Feb 18 09:59:26 2003
--- gnue/common/src/datasources/drivers/sqlrelay/sqlrelay/Driver.py     Tue Feb 
18 14:34:59 2003
***************
*** 41,47 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 41,47 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
Index: gnue/common/src/datasources/drivers/sybase/sybase/Driver.py
diff -c gnue/common/src/datasources/drivers/sybase/sybase/Driver.py:1.12 
gnue/common/src/datasources/drivers/sybase/sybase/Driver.py:1.13
*** gnue/common/src/datasources/drivers/sybase/sybase/Driver.py:1.12    Tue Feb 
18 09:59:26 2003
--- gnue/common/src/datasources/drivers/sybase/sybase/Driver.py Tue Feb 18 
14:34:59 2003
***************
*** 41,47 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  
--- 41,47 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
     import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
            DBSIG_DataObject_SQL, DBSIG_DataObject_Object
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]