Update of /cvsroot/monetdb/clients/src/python/Cimpl/MonetSQLdb
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9410/src/python/Cimpl/MonetSQLdb

Modified Files:
        __init__.py 
Log Message:
propagated changes of Thursday Oct 25 2007 - Wednesday Oct 31 2007
from the Clients_1-20 branch to the development trunk


Index: __init__.py
===================================================================
RCS file: /cvsroot/monetdb/clients/src/python/Cimpl/MonetSQLdb/__init__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- __init__.py 22 Oct 2007 10:35:51 -0000      1.4
+++ __init__.py 31 Oct 2007 10:38:11 -0000      1.5
@@ -110,8 +110,8 @@
             if not kwargs.has_key('user'): kwargs['user'] = 'monetdb'
             if not kwargs.has_key('password'): kwargs['password'] = 'monetdb'
         else:
-            if not kwargs.has_key('dbname'): kwargs['dbname'] = 'demo'
             if not kwargs.has_key('version'): kwargs['version'] = 5
+        if not kwargs.has_key('dbname'): kwargs['dbname'] = 'demo'
         if not kwargs.has_key('lang'): kwargs['lang'] = 'sql'
 
         self.lang = kwargs['lang']
@@ -127,7 +127,7 @@
             self.converter = converters.conversions
 
         if not kwargs.has_key('dbfarm'):
-            self._mapi = Mapi(kwargs['host'], kwargs['port'], kwargs['user'], 
kwargs['password'], kwargs['lang'])
+            self._mapi = Mapi(kwargs['host'], kwargs['port'], kwargs['user'], 
kwargs['password'], kwargs['lang'], kwargs['dbname'])
         else:
             self._mapi = Embedded(kwargs['dbfarm'], kwargs['dbname'], 
kwargs['lang'], kwargs['version'])
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to