Merge pull request PyMySQL#32 from methane/autocommit

farcepest · farcepest · commit 95ae115c7d6b · 2013-11-21T11:57:32.000-08:00
More precise get_autocommit based on server_status.
diff --git a/MySQLdb/connections.py b/MySQLdb/connections.py
@@ -232,28 +232,15 @@ def string_decoder(s):
         self.encoders[types.StringType] = string_literal
         self.encoders[types.UnicodeType] = unicode_literal
         self._transactional = self.server_capabilities & CLIENT.TRANSACTIONS
-        self._autocommit = None
         if self._transactional:
             if autocommit is not None:
                 self.autocommit(autocommit)
         self.messages = []
 
     def autocommit(self, on):
         on = bool(on)
-        _mysql.connection.autocommit(self, on)
-        self._autocommit = on
-
-    def get_autocommit(self):
-        if self._autocommit is None:
-            self._update_autocommit()
-        return self._autocommit
-
-    def _update_autocommit(self):
-        cursor = cursors.Cursor(self)
-        cursor.execute("SELECT @@AUTOCOMMIT")
-        row = cursor.fetchone()
-        self._autocommit = bool(row[0])
-        cursor.close()
+        if self.get_autocommit() != on:
+            _mysql.connection.autocommit(self, on)
 
     def cursor(self, cursorclass=None):
         """
diff --git a/_mysql.c b/_mysql.c
@@ -891,7 +891,21 @@ _mysql_ConnectionObject_autocommit(
 	if (err) return _mysql_Exception(self);
 	Py_INCREF(Py_None);
 	return Py_None;
-}		
+}
+
+static char _mysql_ConnectionObject_get_autocommit__doc__[] =
+"Get the autocommit mode. True when enable; False when disable.\n";
+
+static PyObject *
+_mysql_ConnectionObject_get_autocommit(
+	_mysql_ConnectionObject *self,
+	PyObject *args)
+{
+	if (self->connection.server_status & SERVER_STATUS_AUTOCOMMIT) {
+		Py_RETURN_TRUE;
+	}
+	Py_RETURN_FALSE;
+}
 
 static char _mysql_ConnectionObject_commit__doc__[] =
 "Commits the current transaction\n\
@@ -2317,6 +2331,12 @@ static PyMethodDef _mysql_ConnectionObject_methods[] = {
 		METH_VARARGS,
 		_mysql_ConnectionObject_autocommit__doc__
 	},
+	{
+		"get_autocommit",
+		(PyCFunction)_mysql_ConnectionObject_get_autocommit,
+		METH_NOARGS,
+		_mysql_ConnectionObject_get_autocommit__doc__
+	},
 	{
 		"commit",
 		(PyCFunction)_mysql_ConnectionObject_commit,
