gnue/gnue-common src/dbdrivers/db2/DBdriver.py ...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/11 01:11:03

Modified files:
        gnue-common/src/dbdrivers/db2: DBdriver.py 
        gnue-common/src/dbdrivers/informix: DBdriver.py 
        gnue-common/src/dbdrivers/ingres: DBdriver.py 
        gnue-common/src/dbdrivers/interbase: DBdriver.py 
        gnue-common/src/dbdrivers/mysql: DBdriver.py 
        gnue-common/src/dbdrivers/oracle: DBdriver.py 
        gnue-common/src/dbdrivers/popy: DBdriver.py 
        gnue-common/src/dbdrivers/psycopg: DBdriver.py 
        gnue-common/src/dbdrivers/pypgsql: DBdriver.py 
        gnue-common/src/dbdrivers/sqlrelay: DBdriver.py 
Added files:
        gnue-common    : README.databases 

Log message:
        added comprehensive list of supported databases; cleaned up dbdriver 
comments

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/README.databases?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/db2/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/informix/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/ingres/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/interbase/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/mysql/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/oracle/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/popy/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/pypgsql/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/sqlrelay/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/dbdrivers/db2/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/db2/DBdriver.py:1.8 
gnue/gnue-common/src/dbdrivers/db2/DBdriver.py:1.9
--- gnue/gnue-common/src/dbdrivers/db2/DBdriver.py:1.8  Sun Nov  4 17:22:34 2001
+++ gnue/gnue-common/src/dbdrivers/db2/DBdriver.py      Sun Nov 11 01:11:02 2001
@@ -25,6 +25,7 @@
 # Driver to provide access to data stored in a DB2 database
 #
 # NOTES:
+#   ftp://people.linuxkorea.co.kr/pub/DB2/
 #
 #   Supported attributes (via connections.conf or <database> tag)
 #
Index: gnue/gnue-common/src/dbdrivers/informix/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/informix/DBdriver.py:1.3 
gnue/gnue-common/src/dbdrivers/informix/DBdriver.py:1.4
--- gnue/gnue-common/src/dbdrivers/informix/DBdriver.py:1.3     Sun Nov  4 
17:22:34 2001
+++ gnue/gnue-common/src/dbdrivers/informix/DBdriver.py Sun Nov 11 01:11:02 2001
@@ -19,11 +19,11 @@
 # Copyright 2000, 2001 Free Software Foundation
 #
 # FILE:
-# DBdriver.py
+# informix/DBdriver.py
 #
 # DESCRIPTION:
 # Driver to provide access to data via Alexander Kuznetsov's
-# Informix/Python Driver  *  Requires Kinfxdb 2.2+
+# Informix/Python Driver  *  Requires Kinfxdb 0.2+
 # (http://thor.prohosting.com/~alexan/pub/Kinfxdb/Kinfxdb-0.2.tar.gz)
 #
 # NOTES:
Index: gnue/gnue-common/src/dbdrivers/ingres/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/ingres/DBdriver.py:1.4 
gnue/gnue-common/src/dbdrivers/ingres/DBdriver.py:1.5
--- gnue/gnue-common/src/dbdrivers/ingres/DBdriver.py:1.4       Sun Nov  4 
17:22:35 2001
+++ gnue/gnue-common/src/dbdrivers/ingres/DBdriver.py   Sun Nov 11 01:11:02 2001
@@ -19,7 +19,7 @@
 # Copyright 2000, 2001 Free Software Foundation
 #
 # FILE:
-# DBdriver.py
+# ingres/DBdriver.py
 #
 # DESCRIPTION:
 # Driver to provide access to data via Holger Meyer's Ingres/Python Driver
Index: gnue/gnue-common/src/dbdrivers/interbase/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/interbase/DBdriver.py:1.3 
gnue/gnue-common/src/dbdrivers/interbase/DBdriver.py:1.4
--- gnue/gnue-common/src/dbdrivers/interbase/DBdriver.py:1.3    Sun Nov  4 
17:22:35 2001
+++ gnue/gnue-common/src/dbdrivers/interbase/DBdriver.py        Sun Nov 11 
01:11:02 2001
@@ -19,7 +19,7 @@
 # Copyright 2000, 2001 Free Software Foundation
 #
 # FILE:
-# DBdriver.py
+# interbase/DBdriver.py
 #
 # DESCRIPTION:
 # Driver to provide access to data via the Kinterbasdb Interbase/Python Driver
Index: gnue/gnue-common/src/dbdrivers/mysql/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/mysql/DBdriver.py:1.8 
gnue/gnue-common/src/dbdrivers/mysql/DBdriver.py:1.9
--- gnue/gnue-common/src/dbdrivers/mysql/DBdriver.py:1.8        Sun Nov  4 
17:22:35 2001
+++ gnue/gnue-common/src/dbdrivers/mysql/DBdriver.py    Sun Nov 11 01:11:02 2001
@@ -38,8 +38,8 @@
 
 try: 
   import MySQLdb
-except ImportError, mesg: 
-  GDebug.printMesg(1,mesg) 
+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 " \
@@ -94,7 +94,7 @@
       pass
 
 class MySQL_DataObject_Object(MySQL_DataObject, \
-      DBSIG_DataObject_Object): 
+      DBSIG_DataObject_Object):
 
   def __init__(self): 
     # Call DBSIG init first because MySQL_DataObject needs to overwrite 
Index: gnue/gnue-common/src/dbdrivers/oracle/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/oracle/DBdriver.py:1.11 
gnue/gnue-common/src/dbdrivers/oracle/DBdriver.py:1.12
--- gnue/gnue-common/src/dbdrivers/oracle/DBdriver.py:1.11      Thu Nov  8 
02:55:52 2001
+++ gnue/gnue-common/src/dbdrivers/oracle/DBdriver.py   Sun Nov 11 01:11:03 2001
@@ -19,7 +19,7 @@
 # Copyright 2000, 2001 Free Software Foundation
 #
 # FILE:
-# DBdriver.py
+# oracle/DBdriver.py
 #
 # DESCRIPTION:
 # Driver to provide access to data via Digital Creations Oracle/Python Driver
Index: gnue/gnue-common/src/dbdrivers/popy/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/popy/DBdriver.py:1.5 
gnue/gnue-common/src/dbdrivers/popy/DBdriver.py:1.6
--- gnue/gnue-common/src/dbdrivers/popy/DBdriver.py:1.5 Thu Nov  8 02:55:52 2001
+++ gnue/gnue-common/src/dbdrivers/popy/DBdriver.py     Sun Nov 11 01:11:03 2001
@@ -19,18 +19,16 @@
 # Copyright 2000, 2001 Free Software Foundation
 #
 # FILE:
-# postgresql/DBdriver.py
+# popy/DBdriver.py
 #
 # DESCRIPTION:
-# Postgresql implementation of dbdriver using Python DB-SIG v2 
+# Postgresql implementation of dbdriver using Python DB-SIG v2
 # specification.
 #
 # NOTES:
 #
 
 
-import PoPy
-
 from string import lower, join
 import sys
 from gnue.common import GDebug, GDataObjects
@@ -38,22 +36,34 @@
    import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
           DBSIG_DataObject_SQL, DBSIG_DataObject_Object
 
+try:
+  import PoPy
+except ImportError, mesg:
+  GDebug.printMesg(1,mesg)
+  print "-"*79
+  print "\nCould not load PoPy.  For PostgreSQL support, please install \n" \
+      + "PoPy " \
+      + "from http://sourceforge.net/projects/popy\n";
+  print "Error:  %s" % mesg
+  print "-"*79
+  sys.exit()
+
 
-class PG_RecordSet(DBSIG_RecordSet): 
-  pass    
+class PG_RecordSet(DBSIG_RecordSet):
+  pass
 
-class PG_ResultSet(DBSIG_ResultSet): 
-  def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None): 
+class PG_ResultSet(DBSIG_ResultSet):
+  def __init__(self, dataObject, cursor=None, defaultValues={}, 
masterRecordSet=None):
     DBSIG_ResultSet.__init__(self, dataObject, \
             cursor, defaultValues, masterRecordSet)
     self._recordSetClass = PG_RecordSet
 
-class PG_DataObject(DBSIG_DataObject): 
-  def __init__(self): 
+class PG_DataObject(DBSIG_DataObject):
+  def __init__(self):
     DBSIG_DataObject.__init__(self)
     self._DatabaseError = PoPy.DatabaseError
 
-  def connect(self, connectData={}): 
+  def connect(self, connectData={}):
     GDebug.printMesg(1,"Postgresql database driver initializing")
     try: 
       self._dataConnection = PoPy.connect('user=%s password=%s host=%s 
dbname=%s' %
@@ -162,7 +172,7 @@
 
 
 class PG_DataObject_Object(PG_DataObject, \
-      DBSIG_DataObject_Object): 
+      DBSIG_DataObject_Object):
 
   def __init__(self): 
     # Call DBSIG init first because PG_DataObject needs to overwrite 
Index: gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py:1.5 
gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py:1.6
--- gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py:1.5      Thu Nov  8 
02:55:52 2001
+++ gnue/gnue-common/src/dbdrivers/psycopg/DBdriver.py  Sun Nov 11 01:11:03 2001
@@ -19,7 +19,7 @@
 # Copyright 2000, 2001 Free Software Foundation
 #
 # FILE:
-# postgresql/DBdriver.py
+# psycopg/DBdriver.py
 #
 # DESCRIPTION:
 # Postgresql implementation of dbdriver using Python DB-SIG v2 
Index: gnue/gnue-common/src/dbdrivers/pypgsql/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/pypgsql/DBdriver.py:1.9 
gnue/gnue-common/src/dbdrivers/pypgsql/DBdriver.py:1.10
--- gnue/gnue-common/src/dbdrivers/pypgsql/DBdriver.py:1.9      Sat Nov 10 
18:55:45 2001
+++ gnue/gnue-common/src/dbdrivers/pypgsql/DBdriver.py  Sun Nov 11 01:11:03 2001
@@ -12,8 +12,8 @@
 # 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 
+# 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, 2001 Free Software Foundation
@@ -28,10 +28,6 @@
 # NOTES:
 #
 
-try:
-  from pyPgSQL import PgSQL # pyPgSQL 2.0 support
-except ImportError:
-  import PgSQL              # pyPgSQL 1.6 support
 
 from string import lower, join
 import sys
@@ -40,7 +36,12 @@
    import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
           DBSIG_DataObject_SQL, DBSIG_DataObject_Object
 
+try:
+  from pyPgSQL import PgSQL # pyPgSQL 2.0 support
+except ImportError:
+  import PgSQL              # pyPgSQL 1.6 support
 
+  
 class PG_RecordSet(DBSIG_RecordSet):
   pass
 
Index: gnue/gnue-common/src/dbdrivers/sqlrelay/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/sqlrelay/DBdriver.py:1.1 
gnue/gnue-common/src/dbdrivers/sqlrelay/DBdriver.py:1.2
--- gnue/gnue-common/src/dbdrivers/sqlrelay/DBdriver.py:1.1     Tue Nov  6 
18:24:28 2001
+++ gnue/gnue-common/src/dbdrivers/sqlrelay/DBdriver.py Sun Nov 11 01:11:03 2001
@@ -23,7 +23,7 @@
 #
 # DESCRIPTION:
 # Driver to provide access to data via SQLRelay's Python Driver
-# Requires SQLRelay + Python Driver (http://www.firstworks.com/sqlrelay)
+# Requires SQLRelay + Python-DB Driver (http://www.firstworks.com/sqlrelay)
 #
 # NOTES:
 #