[gnue] r8240 - trunk/gnue-common/src/datasources/drivers/sql/mysql

[jan]

Author: jan
Date: 2006-03-17 23:39:59 -0600 (Fri, 17 Mar 2006)
New Revision: 8240

Modified:
   trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
   trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py
Log:
Mysql drv updates:
- add support for --owner (even it is more a dbadmin for mysql)
- fix deprecation warning by calling BEGIN explicitly


Modified: trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py     
2006-03-18 05:37:32 UTC (rev 8239)
+++ trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py     
2006-03-18 05:39:59 UTC (rev 8240)
@@ -93,13 +93,15 @@
     password = self.__connection.parameters.get ('password')
     host     = self.__connection.parameters.get ('host')
     port     = self.__connection.parameters.get ('port')
+    owner    = self.__connection.parameters.get ('owner', username)
+    ownerpwd = self.__connection.parameters.get ('ownerpwd')
 
     createdb = u"mysqladmin %(site)s%(port)s%(user)s%(pwd)s create %(db)s" \
         % {'db'  : dbname,
            'site': host and "--host=%s " % host or '',
            'port': port and "--port=%s " % port or '',
-           'user': username and "--user=%s " % username or '',
-           'pwd' : password and "--password=%s " % password or ''}
+           'user': owner and "--user=%s " % owner or '',
+           'pwd' : ownerpwd and "--password=%s " % ownerpwd or ''}
 
     os.system (createdb)
 
@@ -112,9 +114,10 @@
         % {'sql' : sql,
            'host': host and "--host=%s " % host or '',
            'port': port and "--port=%s " % port or '',
-           'user': username and "--user=%s " % username or '',
-           'pass': password and "--password=%s " % password or '',
+           'user': owner and "--user=%s " % owner or '',
+           'pass': ownerpwd and "--password=%s " % ownerpwd or '',
            'db'  : dbname}
+
     os.system (grant)
 
     sql = u"GRANT ALL PRIVILEGES ON %(db)s.* TO '%(user)s'@'localhost' " \
@@ -127,8 +130,8 @@
         % {'sql' : sql,
            'host': host and "--host=%s " % host or '',
            'port': port and "--port=%s " % port or '',
-           'user': username and "--user=%s " % username or '',
-           'pass': password and "--password=%s " % password or '',
+           'user': owner and "--user=%s " % owner or '',
+           'pass': ownerpwd and "--password=%s " % ownerpwd or '',
            'db'  : dbname}
 
     os.system (grant)

Modified: trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py   
2006-03-18 05:37:32 UTC (rev 8239)
+++ trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py   
2006-03-18 05:39:59 UTC (rev 8240)
@@ -146,7 +146,8 @@
   def _beginTransaction_ (self):
     # only available if MySQL is compiled with transaction support
     try:
-      self._native.begin ()
+      self.sql1("BEGIN")
+      # self._native.begin ()
     except:
       pass