gnue-common/src/datasources/drivers/mysql/mysql...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/11/06 03:29:10

Modified files:
        src/datasources/drivers/mysql/mysql: Driver.py 

Log message:
        fix mysql driver to work with "None" style empty passwords/usernames

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.9 
gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.10
*** gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.9       Wed Nov 
 5 09:56:01 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/Driver.py   Thu Nov  6 
03:29:10 2003
***************
*** 116,127 ****
      DBSIG_DataObject.__init__(self)
      self._DatabaseError = MySQLdb.DatabaseError
      self._resultSetClass = MySQL_ResultSet
    def connect(self, connectData={}):
      GDebug.printMesg(1,"Mysql database driver initializing")
  
      try:
!       self._dataConnection = MySQLdb.connect(user=connectData['_username'],
!                    passwd=connectData['_password'],
                     host=connectData['host'],
                     db=connectData['dbname'])
      except self._DatabaseError, value:
--- 116,132 ----
      DBSIG_DataObject.__init__(self)
      self._DatabaseError = MySQLdb.DatabaseError
      self._resultSetClass = MySQL_ResultSet
+     
    def connect(self, connectData={}):
      GDebug.printMesg(1,"Mysql database driver initializing")
+    
+     # 1. just allow string type username/password 2. None -> ''
+     user   = str(connectData['_username'] or '')
+     passwd = str(connectData['_password'] or '')
  
      try:
!       self._dataConnection = MySQLdb.connect(user=user,
!                    passwd=passwd,
                     host=connectData['host'],
                     db=connectData['dbname'])
      except self._DatabaseError, value: