[SQL-CVS] r662 - trunk/SQLObject/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2005-03-03 12:12:15 +0000 (Thu, 03 Mar 2005)
New Revision: 662

Modified:
   trunk/SQLObject/sqlobject/mysql/mysqlconnection.py
Log:
Fixed the bug https://sourceforge.net/tracker/index.php?func=detail&aid=1150183&group_id=74338&atid=540672
Modified makeConnection and set autocommit if it's supported.


Modified: trunk/SQLObject/sqlobject/mysql/mysqlconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/mysql/mysqlconnection.py	2005-03-01 23:09:06 UTC (rev 661)
+++ trunk/SQLObject/sqlobject/mysql/mysqlconnection.py	2005-03-03 12:12:15 UTC (rev 662)
@@ -27,9 +27,20 @@
     connectionFromURI = classmethod(connectionFromURI)
 
     def makeConnection(self):
-        return MySQLdb.connect(host=self.host, port=self.port, db=self.db,
-                               user=self.user, passwd=self.password)
+        try:
+            conn = self.module.connect(host=self.host, port=self.port,
+                db=self.db, user=self.user, passwd=self.password)
+        except self.module.OperationalError, e:
+            raise self.module.OperationalError(
+                "%s; used connection string: host=%s, port=%s, db=%s, user=%s, pwd=%s" % (
+                e, self.host, self.port, self.db, self.user, self.password)
+            )
 
+        if hasattr(conn, 'autocommit'):
+            conn.autocommit(self.autoCommit)
+
+        return conn
+
     def _executeRetry(self, conn, cursor, query):
         while 1:
             try: