gnue/common/src/dbdrivers _pgsql/DBdriver.py py...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/01/29 12:39:05

Modified files:
        common/src/dbdrivers/_pgsql: DBdriver.py 
        common/src/dbdrivers/pypgsql: DBdriver.py 

Log message:
        Updated _pgsql to accept different connect strings from different 
drivers
        Updates pypgsql to pass proper connect string so that auth other than 
ident would work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_pgsql/DBdriver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/pypgsql/DBdriver.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/_pgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.7 
gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.8
*** gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.7    Mon Jan 21 13:50:24 2002
--- gnue/common/src/dbdrivers/_pgsql/DBdriver.py        Tue Jan 29 12:39:05 2002
***************
*** 50,55 ****
--- 50,56 ----
  class PGSQL_DataObject(DBSIG_DataObject):
    def __init__(self, pgdriver=None, pgresultset=None):
      DBSIG_DataObject.__init__(self)
+     self._connectString = 'host=%s dbname=%s user=%s password=%s'
      if pgdriver:
        self._pgdriver = pgdriver
        self._DatabaseError = self._pgdriver.DatabaseError
***************
*** 59,65 ****
  
    # TODO: leaving here as placeholder for a common connect function for std 
postgresql drivers
    def connect(self, connectData={}):
-     pass
      GDebug.printMesg(1,"Postgresql database driver initializing")
      try:
        #self._dataConnection = self._pgdriver.connect("%s::%s:%s:%s::" % \
--- 60,65 ----
***************
*** 67,80 ****
        #        connectData['dbname'],
        #        connectData['_username'],
        #        connectData['_password']))
!       self._dataConnection = self._pgdriver.connect('user=%s password=%s 
host=%s dbname=%s' %
!                                           (connectData['_username'], 
connectData['_password'], connectData['host'], connectData['dbname']))
        self.triggerExtensions = PGSQL_TriggerExtensions(self._dataConnection)
      except self._DatabaseError, value:
!       GDebug.printMesg(1,"%s::%s:%s:***::" % \
               (connectData['host'],
                connectData['dbname'],
!               connectData['_username']))
        GDebug.printMesg(1,"Exception %s " % value)
        raise GDataObjects.LoginError, value
  
--- 67,84 ----
        #        connectData['dbname'],
        #        connectData['_username'],
        #        connectData['_password']))
!       self._dataConnection = self._pgdriver.connect(self._connectString %
!                                                     (connectData['host'],
!                                                      connectData['dbname'],
!                                                      connectData['_username'],
!                                                      
connectData['_password']))
        self.triggerExtensions = PGSQL_TriggerExtensions(self._dataConnection)
      except self._DatabaseError, value:
!       GDebug.printMesg(1,"Connect String: %s" % (self._connectString % \
               (connectData['host'],
                connectData['dbname'],
!               connectData['_username'],
!               connectData['_password'])))
        GDebug.printMesg(1,"Exception %s " % value)
        raise GDataObjects.LoginError, value
  
Index: gnue/common/src/dbdrivers/pypgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/pypgsql/DBdriver.py:1.22 
gnue/common/src/dbdrivers/pypgsql/DBdriver.py:1.23
*** gnue/common/src/dbdrivers/pypgsql/DBdriver.py:1.22  Tue Jan  8 17:07:58 2002
--- gnue/common/src/dbdrivers/pypgsql/DBdriver.py       Tue Jan 29 12:39:05 2002
***************
*** 84,89 ****
--- 84,90 ----
  class PG_DataObject(PGSQL_DataObject):
    def __init__(self):
      PGSQL_DataObject.__init__(self, PgSQL, PG_ResultSet)
+     self._connectString = '%s::%s:%s:%s::'
  
  class PG_DataObject_Object(PG_DataObject, \
        PGSQL_DataObject_Object):