fix use %(name)s in executemany

WorldException · WorldException · commit 07a7be71c93a · 2016-02-24T12:39:06.000+03:00
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -768,19 +768,6 @@ def show_warnings(self):
         result.read()
         return result.rows
 
-    def get_system_variable(self, name, default=None):
-        """Get settings from server"""
-        self._execute_command(COMMAND.COM_QUERY, "SHOW VARIABLES WHERE VARIABLE_NAME = %s" % self.escape(name))
-        result = MySQLResult(self)
-        result.read()
-        if result.rows:
-            variable = result.rows[0][1]
-            if variable.isdigit():
-                return int(variable)
-            else:
-                return variable
-        return default
-
     def select_db(self, db):
         '''Set current db'''
         self._execute_command(COMMAND.COM_INIT_DB, db)
@@ -902,9 +889,6 @@ def connect(self, sock=None):
             self._get_server_information()
             self._request_authentication()
 
-            self.max_allowed_packet = min(self.max_allowed_packet,
-                                          self.get_system_variable('max_allowed_packet', self.max_allowed_packet))
-
             if self.sql_mode is not None:
                 c = self.cursor()
                 c.execute("SET sql_mode=%s", (self.sql_mode,))
diff --git a/pymysql/cursors.py b/pymysql/cursors.py
@@ -25,8 +25,7 @@ class Cursor(object):
     #:
     #: Max size of allowed statement is max_allowed_packet - packet_header_size.
     #: Default value of max_allowed_packet is 1048576.
-    max_stmt_length = 1024000 * 6
-    packet_header_size = 4
+    max_stmt_length = 1024000
 
     def __init__(self, connection):
         '''
@@ -41,7 +40,6 @@ def __init__(self, connection):
         self._executed = None
         self._result = None
         self._rows = None
-        self.max_stmt_length = min(Cursor.max_stmt_length, connection.max_allowed_packet - Cursor.packet_header_size)
 
     def close(self):
         '''
diff --git a/pymysql/tests/test_cursor.py b/pymysql/tests/test_cursor.py
@@ -98,4 +98,4 @@ def test_executemany(self):
         # dict args
         data_dict = [{'data': i} for i in xrange(10)]
         cursor.executemany("insert into test (data) values (%(data)s)", data_dict)
-        self.assertTrue(cursor._executed.endswith(",(7),(8),(9)"), 'execute many with %(data)s not in one query')
+        self.assertTrue(cursor._executed.endswith(",(7),(8),(9)"), 'execute many with %(data)s not in one query')
