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

[Jan Ischebeck]

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

Modified files:
        src/datasources/drivers/postgresql/pypgsql: Driver.py 
        src/datasources/drivers/postgresql/popy: Driver.py 
        src/datasources/drivers/DBSIG2: Driver.py 

Log message:
        Brown paper bag: just encode/decode string types

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/DBSIG2/Driver.py.diff?tr1=1.73&tr2=1.74&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/drivers/DBSIG2/Driver.py
diff -c gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.73 
gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.74
*** gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.73   Tue Oct  7 
09:02:52 2003
--- gnue-common/src/datasources/drivers/DBSIG2/Driver.py        Tue Oct  7 
11:20:26 2003
***************
*** 159,165 ****
              i = 0
              dict = {}
              for f in (rs):
!               if self._dataObject._unicodeMode:
                  f = f.decode(self._dataObject._databaseEncoding)
                  
                dict[string.lower(self._fieldNames[i])] = f
--- 159,165 ----
              i = 0
              dict = {}
              for f in (rs):
!               if self._dataObject._unicodeMode and type(f)==types.StringType:
                  f = f.decode(self._dataObject._databaseEncoding)
                  
                dict[string.lower(self._fieldNames[i])] = f
***************
*** 205,212 ****
         # Used when the 2nd value of EQ or NE is NULL.
         '__iseq':          (2,   2, '(%s IS %s)',             None      ),
         '__isne':          (2,   2, '(%s IS NOT %s)',         None      )}
- 
-   schema2nativeTypes={}
  
    def __init__(self, strictQueryCount=1):
      GDataObjects.DataObject.__init__(self)
--- 205,210 ----
Index: gnue-common/src/datasources/drivers/postgresql/popy/Driver.py
diff -c gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.19 
gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.20
*** gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.19  Tue Oct 
 7 11:07:24 2003
--- gnue-common/src/datasources/drivers/postgresql/popy/Driver.py       Tue Oct 
 7 11:20:26 2003
***************
*** 36,42 ****
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
          PGSQL_TriggerExtensions
  
! import PoPy
  
  class PG_RecordSet(PGSQL_RecordSet):
    pass
--- 36,42 ----
            PGSQL_DataObject_SQL, PGSQL_DataObject_Object, \
          PGSQL_TriggerExtensions
  
! import PoPy, types
  
  class PG_RecordSet(PGSQL_RecordSet):
    pass
***************
*** 59,65 ****
              i = 0
              dict = {}
              for f in (rs):
!               if self._dataObject._unicodeMode:
                  f = f.decode(self._dataObject._databaseEncoding)
                dict[string.lower(self._fieldNames[i])] = f
                i += 1
--- 59,65 ----
              i = 0
              dict = {}
              for f in (rs):
!               if self._dataObject._unicodeMode and type(f)==types.StringType:
                  f = f.decode(self._dataObject._databaseEncoding)
                dict[string.lower(self._fieldNames[i])] = f
                i += 1
Index: gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
diff -c gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.33 
gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.34
*** gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.33       
Tue Oct  7 11:07:23 2003
--- gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py    Tue Oct 
 7 11:20:25 2003
***************
*** 28,34 ****
  # NOTES:
  #
  
! import sys,string
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  from gnue.common.datasources.drivers.postgresql.Base.Driver \
--- 28,34 ----
  # NOTES:
  #
  
! import sys,string,types
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  from gnue.common.datasources.drivers.postgresql.Base.Driver \
***************
*** 70,76 ****
              i = 0
              dict = {}
              for f in (rs):
!               if self._dataObject._unicodeMode:
                  f=f.decode(self._dataObject._databaseEncoding)
                dict[string.lower(self._fieldNames[i])] = f
                i += 1
--- 70,76 ----
              i = 0
              dict = {}
              for f in (rs):
!               if self._dataObject._unicodeMode and type(f)==types.StringType:
                  f=f.decode(self._dataObject._databaseEncoding)
                dict[string.lower(self._fieldNames[i])] = f
                i += 1