BUG21477493: Fix RE_SQL_INSERT_STMT to correctly match Insert Statement

The regex matches the literal "VALUES" in the insert string and assumes
that it is a batch insert, which may not be the case if this literal is
used as a value itself.

The regex is modified to match the complete Insert Statement and made sure
it conforms to the format `INSERT INTO [table_name] (col,...) VALUES(a,...)`.

Unittests have been added for regression.

Author: amitab

lib/mysql/connector/cursor.py

@@ -40,7 +40,8 @@
     r'''\s*ON\s+DUPLICATE\s+KEY(?:[^"'`]*["'`][^"'`]*["'`])*[^"'`]*$''',
     re.I | re.M | re.S)
 RE_SQL_INSERT_STMT = re.compile(
-    r"({0}|\s)*INSERT({0}|\s)*INTO.+VALUES.*".format(SQL_COMMENT),
+    r"({0}|\s)*INSERT({0}|\s)*INTO\s+[`'\"]?.+[`'\"]?(?:\.[`'\"]?.+[`'\"]?)"
+     "{{0,2}}\s+VALUES\s*\(.+(?:\s*,.+)*\)".format(SQL_COMMENT),
     re.I | re.M | re.S)
 RE_SQL_INSERT_VALUES = re.compile(r'.*VALUES\s*(\(.*\)).*', re.I | re.M | re.S)
 RE_PY_PARAM = re.compile(b'(%s)')

tests/test_bugs.py

@@ -4025,6 +4025,61 @@ def test_bad_set_charset_number(self):
         self.assertEqual(self.cnx._charset_id, old_val)
 
 
+class BugOra21477493(tests.MySQLConnectorTests):
+    """Bug 21477493 - EXECUTEMANY() API WITH INSERT INTO .. SELECT STATEMENT
+       RETURNS INTERFACEERROR
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+        cursor = self.cnx.cursor()
+        cursor.execute("DROP TABLE IF EXISTS fun1")
+        cursor.execute("CREATE TABLE fun1(a CHAR(50), b INT)")
+        data=[('A',1),('B',2)]
+        cursor.executemany("INSERT INTO fun1 (a, b) VALUES (%s, %s)",data)
+        cursor.close()
+
+    def tearDown(self):
+        cursor = self.cnx.cursor()
+        cursor.execute("DROP TABLE IF EXISTS fun1")
+        cursor.close()
+
+    def test_insert_into_select_type1(self):
+        data = [('A',1),('B',2)]
+        cursor = self.cnx.cursor()
+        cursor.executemany("INSERT INTO fun1 SELECT CONCAT('VALUES', %s), "
+                           "b + %s FROM fun1", data)
+        cursor.close()
+
+        cursor = self.cnx.cursor()
+        cursor.execute("SELECT * FROM fun1")
+        self.assertEqual(8, len(cursor.fetchall()))
+
+    def test_insert_into_select_type2(self):
+        data = [('A',1),('B',2)]
+        cursor = self.cnx.cursor()
+        cursor.executemany("INSERT INTO fun1 SELECT CONCAT('VALUES(ab, cd)',"
+                           "%s), b + %s FROM fun1", data)
+        cursor.close()
+
+        cursor = self.cnx.cursor()
+        cursor.execute("SELECT * FROM fun1")
+        self.assertEqual(8, len(cursor.fetchall()))
+
+    def test_insert_into_select_type3(self):
+        config = tests.get_mysql_config()
+        data = [('A',1),('B',2)]
+        cursor = self.cnx.cursor()
+        cursor.executemany("INSERT INTO `{0}`.`fun1` SELECT CONCAT('"
+                           "VALUES(ab, cd)', %s), b + %s FROM fun1"
+                           "".format(config["database"]), data)
+        cursor.close()
+
+        cursor = self.cnx.cursor()
+        cursor.execute("SELECT * FROM fun1")
+        self.assertEqual(8, len(cursor.fetchall()))
+
+
 class BugOra21492815(tests.MySQLConnectorTests):
     """BUG#21492815: CALLPROC() HANGS WHEN CONSUME_RESULTS=TRUE
     """