copy regexp from MySQL-python 1.2.4

Fix #7

.travis.yml

@@ -2,5 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
-install: "pip install ."
+install:
+  - "pip install ."
+  - "pip install -r requirements.txt"
 script: nosetests

requirements.txt

@@ -0,0 +1,5 @@
+PyMySQL==0.5
+gevent==1.0
+greenlet==0.4.1
+mock==1.0.1
+nose==1.3.0

setup.py

@@ -26,5 +26,5 @@
                  "Topic :: Software Development :: Libraries :: Python Modules",
                 ],
     test_suite = 'nose.collector',
-    tests_require = ['nose'],
+    tests_require = ['nose', 'mock'],
 )

tests/test_cursors.py

@@ -0,0 +1,17 @@
+from mock import patch, Mock
+import umysqldb.cursors as M
+
+
+def test_executemany_should_handle_on_duplicate_key_update_clause():
+    with patch.object(M.Cursor, '_query') as mock_query:
+        sql = 'INSERT INTO _test(id,val) VALUES(%s,%s) ' \
+              'ON DUPLICATE KEY UPDATE id=VALUES(id),val=VALUES(val)'
+        args = [(44495, 1), (44495, 2)]
+        mock_conn = Mock()
+        mock_conn.literal.side_effect = repr
+        cursor = M.Cursor(mock_conn)
+        cursor.executemany(sql, args)
+        mock_query.assert_called_once_with(
+            'INSERT INTO _test(id,val) VALUES\n(%s,%s),(%s,%s)\n '
+            'ON DUPLICATE KEY UPDATE id=VALUES(id),val=VALUES(val)',
+            (44495, 1, 44495, 2))

tests/test_umysqldb.py

@@ -3,6 +3,7 @@
 import umysqldb
 import umysqldb.err
 
+
 @raises(umysqldb.err.OperationalError)
 def test_access_denied_should_raise_OperationalError():
     umysqldb.connect(host='127.0.0.1', user='asdf', passwd='fdsa')

umysqldb/constants.py

@@ -0,0 +1 @@
+from pymysql.constants import *

umysqldb/cursors.py

@@ -1,22 +1,45 @@
 import sys
 import re
 import pymysql.cursors
-
 from .util import setdocstring
 
-#Thank you MySQLdb for the kind regex
-INSERT_VALUES = re.compile(
-    r"(?P<start>.+values\s*)"
-    r"(?P<values>\(((?<!\\)'[^\)]*?\)[^\)]*(?<!\\)?'|[^\(\)]|(?:\([^\)]*\)))+\))"
-    r"(?P<end>.*)",
-    re.I)
+# Thank you MySQLdb for the kind regex
+restr = r"""
+    \s
+    values
+    \s*
+    (
+        \(
+            [^()']*
+            (?:
+                (?:
+                        (?:\(
+                            # ( - editor hightlighting helper
+                            [^)]*
+                        \))
+                    |
+                        '
+                            [^\\']*
+                            (?:\\.[^\\']*)*
+                        '
+                )
+                [^()']*
+            )*
+        \)
+    )
+"""
+
+insert_values = re.compile(restr, re.S | re.I | re.X)
+
 
 def _flatten(alist):
     result = []
     map(result.extend, alist)
     return tuple(result)
 
+
 class Cursor(pymysql.cursors.Cursor):
+
     @setdocstring(pymysql.cursors.Cursor.execute)
     def execute(self, query, args=None):
         if args is None:
@@ -39,23 +62,22 @@ def execute(self, query, args=None):
     def executemany(self, query, args):
         if not args:
             return
-        conn = self._get_db()
-        charset = conn.charset
+        db = self._get_db()
+        charset = db.charset
         if isinstance(query, unicode):
             query = query.encode(charset)
-        
-        matched = INSERT_VALUES.match(query)
-        if not matched:
+
+        m = insert_values.search(query)
+        if not m:
             self.rowcount = sum([self.execute(query, arg) for arg in args])
             return self.rowcount
 
-        #Speed up a bulk insert MySQLdb style
-        start = matched.group('start')
-        values = matched.group('values')
-        end = matched.group('end')
-
-        sql_params = (values for i in range(len(args)))
-        multirow_query = '\n'.join([start, ','.join(sql_params), end])
+        # Speed up a bulk insert MySQLdb style
+        p = m.start(1)
+        e = m.end(1)
+        qv = m.group(1)
+        sql_params = (qv for i in range(len(args)))
+        multirow_query = '\n'.join([query[:p], ','.join(sql_params), query[e:]])
         return self.execute(multirow_query, _flatten(args))
 
     def _query(self, query, args=()):
@@ -71,12 +93,13 @@ def _query(self, query, args=()):
 
 
 class DictCursor(Cursor):
+
     """A cursor which returns results as a dictionary"""
 
     def execute(self, query, args=None):
         result = super(DictCursor, self).execute(query, args)
         if self.description:
-            self._fields = [ field[0] for field in self.description ]
+            self._fields = [field[0] for field in self.description]
         return result
 
     def fetchone(self):
@@ -94,7 +117,8 @@ def fetchmany(self, size=None):
         if self._rows is None:
             return None
         end = self.rownumber + (size or self.arraysize)
-        result = [ dict(zip(self._fields, r)) for r in self._rows[self.rownumber:end] ]
+        result = [dict(zip(self._fields, r))
+                  for r in self._rows[self.rownumber:end]]
         self.rownumber = min(end, len(self._rows))
         return tuple(result)
 
@@ -104,9 +128,9 @@ def fetchall(self):
         if self._rows is None:
             return None
         if self.rownumber:
-            result = [ dict(zip(self._fields, r)) for r in self._rows[self.rownumber:] ]
+            result = [dict(zip(self._fields, r))
+                      for r in self._rows[self.rownumber:]]
         else:
-            result = [ dict(zip(self._fields, r)) for r in self._rows ]
+            result = [dict(zip(self._fields, r)) for r in self._rows]
         self.rownumber = len(self._rows)
         return tuple(result)
-