[Modeling-cvs] ProjectModeling/Modeling/DatabaseAdaptors/MySQLAdaptorLayer MySQLAdaptor.py,1.2,1.3 __init__.py,1.4,1.5

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors/MySQLAdaptorLayer
In directory sc8-pr-cvs1:/tmp/cvs-serv15580/Modeling/DatabaseAdaptors/MySQLAdaptorLayer

Modified Files:
	MySQLAdaptor.py __init__.py 
Log Message:
MySQL: the model's connection dictionary may now give a specific port to connect to.

Index: MySQLAdaptor.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors/MySQLAdaptorLayer/MySQLAdaptor.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MySQLAdaptor.py	28 Jan 2003 18:17:14 -0000	1.2
--- MySQLAdaptor.py	20 Jan 2004 19:43:32 -0000	1.3
***************
*** 85,94 ****
        - 'host' -> 'host' (unchanged)
        
      """
!     return {'db':     '%(database)s'%aModelConnectionDictionary,
!             'user':   '%(user)s'%aModelConnectionDictionary,
!             'passwd': '%(password)s'%aModelConnectionDictionary,
!             'host': '%(host)s'%aModelConnectionDictionary}
! 
    def dbAPI_gimmeCnxAndCursorForDBAdmin(self, administrativeConnectionDictionary):
      cnxDict=self.dbAPI_connectionDictionaryForConnect(administrativeConnectionDictionary)
--- 85,99 ----
        - 'host' -> 'host' (unchanged)
        
+       - 'port' -> 'port' (unchanged) if and only if the key exists
+       
      """
!     dbAPI_d={ 'db':     '%(database)s'%aModelConnectionDictionary,
!               'user':   '%(user)s'%aModelConnectionDictionary,
!               'passwd': '%(password)s'%aModelConnectionDictionary,
!               'host': '%(host)s'%aModelConnectionDictionary }
!     if aModelConnectionDictionary.get('port'):
!       dbAPI_d['port']=int(aModelConnectionDictionary['port'])
!     return dbAPI_d
!       
    def dbAPI_gimmeCnxAndCursorForDBAdmin(self, administrativeConnectionDictionary):
      cnxDict=self.dbAPI_connectionDictionaryForConnect(administrativeConnectionDictionary)

Index: __init__.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors/MySQLAdaptorLayer/__init__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** __init__.py	24 Aug 2003 14:15:13 -0000	1.4
--- __init__.py	20 Jan 2004 19:43:32 -0000	1.5
***************
*** 40,44 ****
  
    'user', 'password' -- user credentials
!   
  Supported SQL datatypes are:
  
--- 40,46 ----
  
    'user', 'password' -- user credentials
! 
!   'port' -- optional; the port to which the database server listens to
! 
  Supported SQL datatypes are: