commit-gnue
[Top][All Lists]
Advanced

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

CVSROOT: /cvsroot/gnue


From: Jason Cater
Subject: CVSROOT: /cvsroot/gnue
Date: Sat, 08 Nov 2003 11:14:59 -0500

Module name:    gnue-common
Branch:         datasource-cleanup
Changes by:     Jason Cater <address@hidden>    03/11/08 11:14:58
Reply-to: address@hidden

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         datasource-cleanup
Changes by:     Jason Cater <address@hidden>    03/11/08 11:14:58

Modified files:
        src/datasources: GConnection.py GConnections.py 
        src/datasources/drivers/adodbapi/adodbapi: __init__.py 
        src/datasources/drivers/appserver/appserver: __init__.py 
        src/datasources/drivers/db2/db2: __init__.py 
        src/datasources/drivers/dbf/dbf: __init__.py 
        src/datasources/drivers/gadfly/gadfly: __init__.py 
        src/datasources/drivers/informix/informix: Connection.py 
                                                   __init__.py 
        src/datasources/drivers/ingres/ingres: __init__.py 
        src/datasources/drivers/interbase/interbase: __init__.py 
        src/datasources/drivers/mysql/mysql: Connection.py DataObject.py 
                                             __init__.py 
        src/datasources/drivers/odbc/wodbc: __init__.py 
        src/datasources/drivers/oracle/cxoracle: __init__.py 
        src/datasources/drivers/oracle/dcoracle: __init__.py 
        src/datasources/drivers/postgresql/Base: Connection.py 
        src/datasources/drivers/postgresql/popy: __init__.py 
        src/datasources/drivers/postgresql/psycopg: __init__.py 
        src/datasources/drivers/postgresql/pygresql: __init__.py 
        src/datasources/drivers/postgresql/pypgsql: __init__.py 
        src/datasources/drivers/sapdb/sapdb: __init__.py 
        src/datasources/drivers/sqlite/sqlite: __init__.py 
        src/datasources/drivers/sqlrelay/sqlrelay: __init__.py 
        src/datasources/drivers/sybase/sybase: __init__.py 
Added files:
        src/datasources/drivers/postgresql/popy: Driver.py 
        src/datasources/drivers/postgresql/pypgsql: Driver.py 

Log message:
        more work on datasource changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/GConnection.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/GConnections.py.diff?only_with_tag=datasource-cleanup&tr1=1.52.2.1&tr2=1.52.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/appserver/appserver/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/db2/db2/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/dbf/dbf/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/gadfly/gadfly/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/informix/informix/Connection.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/informix/informix/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/ingres/ingres/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/odbc/wodbc/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py.diff?only_with_tag=datasource-cleanup&tr1=1.21.2.1&tr2=1.21.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/popy/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py.diff?only_with_tag=datasource-cleanup&tr1=1.35.2.1&tr2=1.35.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/sybase/sybase/__init__.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/GConnection.py
diff -c gnue-common/src/datasources/GConnection.py:1.1.2.2 
gnue-common/src/datasources/GConnection.py:1.1.2.3
*** gnue-common/src/datasources/GConnection.py:1.1.2.2  Fri Oct 10 08:18:47 2003
--- gnue-common/src/datasources/GConnection.py  Sat Nov  8 11:14:55 2003
***************
*** 1,21 ****
  
  
- System Init:
-    +-- GConnections initializes
-    +-- GParser initializes:
-      +-- GDataSource loaded
-    +-- GDataSources Intialized
-      +-- GConnection.getDataObject()
-        +--
- 
- class Connection(GConnection.Connection):
- 
-    def __init__(self):
-       
-       self._encoding = 'iso8859-1'  # contain encoding used by database
-       
-       try:
-          self._encoding = gConfig('textEncoding')
-       except:
-          pass
  
--- 1,61 ----
+ #
+ # 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
+ #
+ # FILE:
+ # GConnection.py
+ #
+ # DESCRIPTION:
+ #
+ # NOTES:
+ #
  
  
  
+ # System Init:
+ #   +-- GConnections initializes
+ #   +-- GParser initializes:
+ #     +-- GDataSource loaded
+ #   +-- GDataSources Intialized
+ #     +-- GConnection.getDataObject()
+ #       +--
+ #
+ class Connection:
+   def __init__(self, connections, parameters):
+     self.manager = connections
+     self.parameters = parameters
+     
+     self._encoding = 'iso8859-1'  # encoding used by database
+ 
+     try:
+       self._encoding = gConfig('textEncoding')
+     except:
+       pass
+ 
+   # Commit changes to the database
+   def commit(self):
+     pass
+ 
+   # Rollback changes to the database
+   def rollback(self):
+     pass
+ 
+   # Close the connection to the database backend
+   def close(self):
+     pass
Index: gnue-common/src/datasources/GConnections.py
diff -c gnue-common/src/datasources/GConnections.py:1.52.2.1 
gnue-common/src/datasources/GConnections.py:1.52.2.2
*** gnue-common/src/datasources/GConnections.py:1.52.2.1        Thu Oct  9 
21:21:08 2003
--- gnue-common/src/datasources/GConnections.py Sat Nov  8 11:14:55 2003
***************
*** 294,303 ****
  
    def loginToConnection(self, connection):
  
      print "loginToConnection: %s" % connection
      try:
        connected = connection.__connected
!     except:
        connected = 0
  
      if not connected:
--- 294,305 ----
  
    def loginToConnection(self, connection):
  
+     print dir(connection)
+ 
      print "loginToConnection: %s" % connection
      try:
        connected = connection.__connected
!     except AttributeError:
        connected = 0
  
      if not connected:
***************
*** 441,446 ****
--- 443,450 ----
        except (AttributeError, ImportError), err:
          pass
          ##print "Not in " + 'gnue.common.datasources.drivers.' + 
string.join(path + [module],'.')
+       except AdapterNotInstalled:
+         GDebug.printMesg(1,'%s does not have all dependencies installed' % 
driver)
  
  
  def _get_dbdriver (driver):
***************
*** 459,464 ****
--- 463,470 ----
            return dbdriver
      except (ImportError, AttributeError):
        GDebug.printMesg(1,'%s does not contain dbdrivers' % (driver))
+     except AdapterNotInstalled:
+       GDebug.printMesg(1,'%s does not have all dependencies installed' % 
driver)
  
    return dbdriver
  
Index: gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
diff -c 
gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py:1.1.2.1   
Thu Oct  9 21:21:11 2003
--- gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py   Sat Nov 
 8 11:14:56 2003
***************
*** 19,26 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("ADO-DB Data Driver for MS SQL-Server/Access")
  __driverurl__ = "http://sourceforge.net/projects/adodbapi";
  
--- 19,24 ----
***************
*** 51,54 ****
--- 49,61 ----
  data_source = myServerName
  initial_catalog = myDatabaseName
  """
+ 
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
  
Index: gnue-common/src/datasources/drivers/appserver/appserver/__init__.py
diff -c 
gnue-common/src/datasources/drivers/appserver/appserver/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/appserver/appserver/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/appserver/appserver/__init__.py:1.1.2.1 
Thu Oct  9 21:21:12 2003
--- gnue-common/src/datasources/drivers/appserver/appserver/__init__.py Sat Nov 
 8 11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("GNUe AppServer Data Driver")
  __driverurl__ = "http://www.gnuenterprise.org/";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("GNUe AppServer Data Driver")
  __driverurl__ = "http://www.gnuenterprise.org/";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/db2/db2/__init__.py
diff -c gnue-common/src/datasources/drivers/db2/db2/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/db2/db2/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/db2/db2/__init__.py:1.1.2.1     Thu Oct 
 9 21:21:13 2003
--- gnue-common/src/datasources/drivers/db2/db2/__init__.py     Sat Nov  8 
11:14:56 2003
***************
*** 19,26 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("IBM DB2 Data Driver")
  __driverurl__ = "ftp://people.linuxkorea.co.kr/pub/DB2/";
  __examples__ = ""
--- 19,24 ----
***************
*** 30,33 ****
--- 28,40 ----
  
       service=    This is the DB2 DSN for your connection  (required)
  """
+ 
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
  
Index: gnue-common/src/datasources/drivers/dbf/dbf/__init__.py
diff -c gnue-common/src/datasources/drivers/dbf/dbf/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/dbf/dbf/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/dbf/dbf/__init__.py:1.1.2.1     Thu Oct 
 9 21:21:15 2003
--- gnue-common/src/datasources/drivers/dbf/dbf/__init__.py     Sat Nov  8 
11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("DBF File Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("DBF File Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/gadfly/gadfly/__init__.py
diff -c gnue-common/src/datasources/drivers/gadfly/gadfly/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/gadfly/gadfly/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/gadfly/gadfly/__init__.py:1.1.2.1       
Thu Oct  9 21:21:15 2003
--- gnue-common/src/datasources/drivers/gadfly/gadfly/__init__.py       Sat Nov 
 8 11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("Gadfly Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("Gadfly Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/informix/informix/Connection.py
diff -c 
gnue-common/src/datasources/drivers/informix/informix/Connection.py:1.1.2.1 
gnue-common/src/datasources/drivers/informix/informix/Connection.py:1.1.2.2
*** gnue-common/src/datasources/drivers/informix/informix/Connection.py:1.1.2.1 
Thu Oct  9 21:21:16 2003
--- gnue-common/src/datasources/drivers/informix/informix/Connection.py Sat Nov 
 8 11:14:56 2003
***************
*** 40,46 ****
  
  from string import lower
  import sys
! from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
  from gnue.common.datasources.drivers import DBSIG2
  
--- 40,46 ----
  
  from string import lower
  import sys
! from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  from gnue.common.datasources.drivers import DBSIG2
  
Index: gnue-common/src/datasources/drivers/informix/informix/__init__.py
diff -c 
gnue-common/src/datasources/drivers/informix/informix/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/informix/informix/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/informix/informix/__init__.py:1.1.2.1   
Thu Oct  9 21:21:16 2003
--- gnue-common/src/datasources/drivers/informix/informix/__init__.py   Sat Nov 
 8 11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("Informix Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("Informix Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/ingres/ingres/__init__.py
diff -c gnue-common/src/datasources/drivers/ingres/ingres/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/ingres/ingres/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/ingres/ingres/__init__.py:1.1.2.1       
Thu Oct  9 21:21:18 2003
--- gnue-common/src/datasources/drivers/ingres/ingres/__init__.py       Sat Nov 
 8 11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("Ingres Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("Ingres Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
diff -c 
gnue-common/src/datasources/drivers/interbase/interbase/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/interbase/interbase/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/interbase/interbase/__init__.py:1.1.2.1 
Thu Oct  9 21:21:19 2003
--- gnue-common/src/datasources/drivers/interbase/interbase/__init__.py Sat Nov 
 8 11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("Interbase Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("Interbase Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/Connection.py:1.1.2.1 
gnue-common/src/datasources/drivers/mysql/mysql/Connection.py:1.1.2.2
*** gnue-common/src/datasources/drivers/mysql/mysql/Connection.py:1.1.2.1       
Thu Oct  9 21:21:21 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/Connection.py       Sat Nov 
 8 11:14:56 2003
***************
*** 30,48 ****
  
  __all__ = ['Connection']
  
  import string
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
- from gnue.common.datasources.drivers import DBSIG2
- from DataObject import *
- from gnue.common.datasources.drivers.mysql.Schema.Discovery.Introspection 
import Introspection
  
  try:
    import MySQLdb
  except ImportError, message:
    tmsg = _("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
    raise GConnections.AdapterNotInstalled, tmsg
  
  
  ######################################################################
--- 30,50 ----
  
  __all__ = ['Connection']
  
+ 
  import string
  import sys
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  
  try:
    import MySQLdb
  except ImportError, message:
    tmsg = _("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
    raise GConnections.AdapterNotInstalled, tmsg
+ 
+ from gnue.common.datasources.drivers import DBSIG2
+ from DataObject import *
+ from gnue.common.datasources.drivers.mysql.Schema.Discovery.Introspection 
import Introspection
  
  
  ######################################################################
Index: gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py:1.1.2.1 
gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py:1.1.2.2
*** gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py:1.1.2.1       
Thu Oct  9 21:21:21 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py       Sat Nov 
 8 11:14:56 2003
***************
*** 33,53 ****
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers.DBSIG2.Driver \
!    import DBSIG2.RecordSet, DBSIG2.ResultSet, DBSIG2.DataObject, \
!           DBSIG2.DataObject_SQL, DBSIG2.DataObject_Object
! 
! try:
!   import MySQLdb
! except ImportError, mesg:
!   GDebug.printMesg(1,mesg)
!   print "-"*79
!   print _("\nCould not load MySQLdb.  For MySQL support, please install \n") \
!       + _("mysql-python 0.9.0 or later from") \
!       + "http://sourceforge.net/projects/mysql-python\n";
!   print _("Error:  %s") % mesg
!   print "-"*79
!   sys.exit()
  
  
  
--- 33,41 ----
  import sys
  from gnue.common.datasources import GDataObjects, GConditions
  from gnue.common.apps import GDebug
! from gnue.common.datasources.drivers import DBSIG2
! 
! import MySQLdb
  
  
  
***************
*** 55,62 ****
    pass
  
  
! class MySQL_ResultSet(DBSIG2.ResultSet): 
!   def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None): 
      DBSIG2.ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
      self._recordSetClass = MySQL_RecordSet
--- 43,50 ----
    pass
  
  
! class MySQL_ResultSet(DBSIG2.ResultSet):
!   def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
      DBSIG2.ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
      self._recordSetClass = MySQL_RecordSet
Index: gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/mysql/mysql/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/mysql/mysql/__init__.py:1.1.2.1 Thu Oct 
 9 21:21:21 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/__init__.py Sat Nov  8 
11:14:56 2003
***************
*** 18,27 ****
  #
  # Copyright 2000-2003 Free Software Foundation
  #
- 
- from Connection import *
- 
  __description__ = _("MySQL Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 18,33 ----
  #
  # Copyright 2000-2003 Free Software Foundation
  #
  __description__ = _("MySQL Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Connection import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/odbc/wodbc/__init__.py
diff -c gnue-common/src/datasources/drivers/odbc/wodbc/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/odbc/wodbc/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/odbc/wodbc/__init__.py:1.1.2.1  Thu Oct 
 9 21:21:22 2003
--- gnue-common/src/datasources/drivers/odbc/wodbc/__init__.py  Sat Nov  8 
11:14:56 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("Windows ODBC Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("Windows ODBC Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
diff -c gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py:1.1.2.1     
Thu Oct  9 21:21:24 2003
--- gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py     Sat Nov 
 8 11:14:57 2003
***************
*** 1,6 ****
! from Driver import *
  
  __description__ = _("CX_Oracle Data Driver for Oracle 7.3/8i/9i+ (OCI8)")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 1,43 ----
! #
! # 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
! #
! # FILE:
! # cxoracle/__init__.py
! #
! # DESCRIPTION:
! # Oracle implementation of dbdriver using Python DB-SIG v2
! # specification.
! #
! # NOTES:
! #
  
  __description__ = _("CX_Oracle Data Driver for Oracle 7.3/8i/9i+ (OCI8)")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
diff -c gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py:1.1.2.1     
Thu Oct  9 21:21:26 2003
--- gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py     Sat Nov 
 8 11:14:57 2003
***************
*** 1,6 ****
! from Driver import *
  
  __description__ = _("DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 1,43 ----
! #
! # 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
! #
! # FILE:
! # dcoracle/__init__.py
! #
! # DESCRIPTION:
! # Oracle implementation of dbdriver using Python DB-SIG v2
! # specification.
! #
! # NOTES:
! #
  
  __description__ = _("DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
diff -c 
gnue-common/src/datasources/drivers/postgresql/Base/Connection.py:1.1.2.2 
gnue-common/src/datasources/drivers/postgresql/Base/Connection.py:1.1.2.3
*** gnue-common/src/datasources/drivers/postgresql/Base/Connection.py:1.1.2.2   
Fri Oct 10 08:18:50 2003
--- gnue-common/src/datasources/drivers/postgresql/Base/Connection.py   Sat Nov 
 8 11:14:57 2003
***************
*** 85,90 ****
--- 85,92 ----
  
    def connect(self                                                            
                                                                                
                                                                                
              , connectData={}):
  
+     print "Postgresql database driver initializing"
+     
      if not hasattr(self,'_DatabaseError'):
        self._DatabaseError = self._pg_driver.DatabaseError
  
***************
*** 127,133 ****
        if self._pg_encoding not in ("",'DEFAULT'):
          GDebug.printMesg(1,'Setting postgresql client_encoding to %s (%s)' % 
(self._pg_encoding,
                                                                                
self._encoding))
!         cursor = self._dataConnection.cursor()
          cursor.execute("SET CLIENT_ENCODING TO '%s'" % self._pg_encoding)
          cursor.close()
  
--- 129,135 ----
        if self._pg_encoding not in ("",'DEFAULT'):
          GDebug.printMesg(1,'Setting postgresql client_encoding to %s (%s)' % 
(self._pg_encoding,
                                                                                
self._encoding))
!         cursor = self.native.cursor()
          cursor.execute("SET CLIENT_ENCODING TO '%s'" % self._pg_encoding)
          cursor.close()
  
Index: gnue-common/src/datasources/drivers/postgresql/popy/Driver.py
diff -c /dev/null 
gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.21.2.2
*** /dev/null   Sat Nov  8 11:14:59 2003
--- gnue-common/src/datasources/drivers/postgresql/popy/Driver.py       Sat Nov 
 8 11:14:57 2003
***************
*** 0 ****
--- 1,38 ----
+ #
+ # 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
+ #
+ # FILE:
+ # popy/DBdriver.py
+ #
+ # DESCRIPTION:
+ # Postgresql implementation of dbdriver using Python DB-SIG v2
+ # specification.
+ #
+ # NOTES:
+ #
+ 
+ __all__ = ('Connection')
+ 
+ from gnue.common.datasources.drivers.postgresql import Base
+ import PoPy
+ 
+ class Connection(Base.Connection):
+   _pg_driver = PoPy
+ 
Index: gnue-common/src/datasources/drivers/postgresql/popy/__init__.py
diff -c gnue-common/src/datasources/drivers/postgresql/popy/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/postgresql/popy/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/postgresql/popy/__init__.py:1.1.2.1     
Thu Oct  9 21:21:28 2003
--- gnue-common/src/datasources/drivers/postgresql/popy/__init__.py     Sat Nov 
 8 11:14:57 2003
***************
*** 28,44 ****
  # NOTES:
  #
  
- __all__ = ('Connection')
- 
- from gnue.common.datasources.drivers.postgresql import Base
- import PoPy
- 
- class Connection(Base.Connection):
-   _pg_driver = PoPy
- 
- 
- 
  __description__ = _("PoPy Data Driver for PostgreSQL")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 28,43 ----
  # NOTES:
  #
  
  __description__ = _("PoPy Data Driver for PostgreSQL")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
diff -c 
gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py:1.1.2.1  
Thu Oct  9 21:21:28 2003
--- gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py  Sat Nov 
 8 11:14:58 2003
***************
*** 41,43 ****
--- 41,53 ----
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
diff -c 
gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py:1.1.2.1 
Thu Oct  9 21:21:28 2003
--- gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py Sat Nov 
 8 11:14:58 2003
***************
*** 79,81 ****
--- 79,90 ----
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
diff -c /dev/null 
gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.35.2.2
*** /dev/null   Sat Nov  8 11:14:59 2003
--- gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py    Sat Nov 
 8 11:14:58 2003
***************
*** 0 ****
--- 1,97 ----
+ #
+ # 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
+ #
+ # FILE:
+ # pypgsql/DBdriver.py
+ #
+ # DESCRIPTION:
+ # Postgresql implementation of dbdriver using Python DB-SIG v2
+ # specification.
+ #
+ # NOTES:
+ #
+ 
+ __all__ = ('Connection')
+ 
+ import sys
+ from gnue.common.datasources import GDataObjects, GConditions, GConnections
+ from gnue.common.apps import GDebug
+ from gnue.common.datasources.drivers.postgresql import Base
+ 
+ try:
+   from pyPgSQL import PgSQL # pyPgSQL 2.0 support
+ except ImportError:
+   import PgSQL              # pyPgSQL 1.6 support
+ 
+ 
+ 
+ class ResultSet(Base.ResultSet):
+ 
+   # TODO: Override the base _loadNextRecord as the fetchmany() from the cursor
+   # TODO: returns an exception instead of None.  Not sure wazzup with that.
+   def _loadNextRecord(self):
+     if self._cursor:
+       rs = None
+ 
+       try:
+         rsets = self._cursor.fetchmany()
+       except self._dataObject._DatabaseError, err:
+         rsets = None
+       except:
+         rsets = None
+ 
+       if rsets and len(rsets):
+         for rs in(rsets):
+           if rs:
+             i = 0
+             dict = {}
+             for f in (rs):
+               dict[self._fieldNames[i]] = f
+               i += 1
+             self._cachedRecords.append (self._recordSetClass(parent=self, \
+                                                              
initialData=dict))
+           else:
+             return 0
+         return 1
+       else:
+         return 0
+     else:
+       return 0
+ 
+ 
+ 
+ class DataObject_Object(Base.DataObject_Object):
+   _resultSetClass = ResultSet
+ 
+ 
+ class DataObject_SQL(Base.DataObject_SQL):
+   _resultSetClass = ResultSet
+ 
+ 
+ class Connection(Base.Connection):
+   _pg_driver = PgSQL
+   _pg_connectString = '%s::%s:%s:%s::%s'
+ 
+   _supportedDataObjects = {
+     'object': DataObject_Object,
+     'sql':    DataObject_SQL
+   }
+ 
+ 
Index: gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
diff -c 
gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py:1.1.2.1  
Thu Oct  9 21:21:29 2003
--- gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py  Sat Nov 
 8 11:14:58 2003
***************
*** 28,105 ****
  # NOTES:
  #
  
- __all__ = ('Connection')
- 
- 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
- 
- try:
-   from pyPgSQL import PgSQL # pyPgSQL 2.0 support
- except ImportError:
-   import PgSQL              # pyPgSQL 1.6 support
- 
- 
- 
- class ResultSet(Base.ResultSet):
- 
-   # TODO: Override the base _loadNextRecord as the fetchmany() from the cursor
-   # TODO: returns an exception instead of None.  Not sure wazzup with that.
-   def _loadNextRecord(self):
-     if self._cursor:
-       rs = None
- 
-       try:
-         rsets = self._cursor.fetchmany()
-       except self._dataObject._DatabaseError, err:
-         rsets = None
-       except:
-         rsets = None
- 
-       if rsets and len(rsets):
-         for rs in(rsets):
-           if rs:
-             i = 0
-             dict = {}
-             for f in (rs):
-               dict[self._fieldNames[i]] = f
-               i += 1
-             self._cachedRecords.append (self._recordSetClass(parent=self, \
-                                                              
initialData=dict))
-           else:
-             return 0
-         return 1
-       else:
-         return 0
-     else:
-       return 0
- 
- 
- 
- class DataObject_Object(Base.DataObject_Object)
-   _resultSetClass = PG_ResultSet
- 
- 
- class DataObject_SQL(Base.DataObject_SQL)
-   _resultSetClass = PG_ResultSet
- 
- 
- class Connection(Base.Connection):
-   _pg_driver = PgSQL
-   _pg_connectString = '%s::%s:%s:%s::%s'
- 
-   _supportedDataObjects = {
-     'object': DataObject_Object,
-     'sql':    DataObject_SQL
-   }
- 
- 
- 
  __description__ = _("PyPGsql Data Driver for PostgreSQL")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 28,43 ----
  # NOTES:
  #
  
  __description__ = _("PyPGsql Data Driver for PostgreSQL")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Driver import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
diff -c gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py:1.1.2.1 Thu Oct 
 9 21:21:30 2003
--- gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py Sat Nov  8 
11:14:58 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("SAP-DB Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("SAP-DB Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Connection import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
diff -c gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py:1.1.2.1       
Thu Oct  9 21:21:33 2003
--- gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py       Sat Nov 
 8 11:14:58 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("SQLite Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("SQLite Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Connection import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/__init__.py
diff -c 
gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/__init__.py:1.1.2.1   
Thu Oct  9 21:21:34 2003
--- gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/__init__.py   Sat Nov 
 8 11:14:58 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("SQLRelay Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("SQLRelay Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Connection import Connection as C
+   return C(*args, **parms)
+ 
Index: gnue-common/src/datasources/drivers/sybase/sybase/__init__.py
diff -c gnue-common/src/datasources/drivers/sybase/sybase/__init__.py:1.1.2.1 
gnue-common/src/datasources/drivers/sybase/sybase/__init__.py:1.1.2.2
*** gnue-common/src/datasources/drivers/sybase/sybase/__init__.py:1.1.2.1       
Thu Oct  9 21:21:35 2003
--- gnue-common/src/datasources/drivers/sybase/sybase/__init__.py       Sat Nov 
 8 11:14:58 2003
***************
*** 19,27 ****
  # Copyright 2000-2003 Free Software Foundation
  #
  
- from Connection import *
- 
  __description__ = _("Sybase Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
--- 19,34 ----
  # Copyright 2000-2003 Free Software Foundation
  #
  
  __description__ = _("Sybase Data Driver")
  __driverurl__ = "http://????";
  __examples__ = ""
  __doc__ = ""
+ 
+ #
+ # Stub code to not initialize the Connection until needed.
+ # This greatly helps with error messages.
+ #
+ def Connection(*args, **parms):
+   from Connection import Connection as C
+   return C(*args, **parms)
+ 




reply via email to

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