Merge pull request #23 from 4031651/master

Fixed raising ValueError for queries that contain the%%.

python/umysql.c

@@ -1081,13 +1081,19 @@ PyObject *EscapeQueryArguments(Connection *self, PyObject *inQuery, PyObject *it
 
       iptr ++;
 
-      if (*iptr != 's')
+      if (*iptr != 's' && *iptr != '%')
       {
         Py_DECREF(iterator);
         if (heap) PyObject_Free(obuffer);
         return PyErr_Format (PyExc_ValueError, "Found character %c expected %%", *iptr);
       }
 
+      if (*iptr == '%')
+      {
+        *(optr++) = *(iptr)++;
+        break;
+      }
+
       iptr ++;
 
       arg = PyIter_Next(iterator);

tests/tests.py

@@ -715,7 +715,22 @@ def testTextCharsets(self):
             self.assertEquals(result, expected)
 
         cnn.close()
-
+
+    def testPercentEscaping(self):
+        cnn = umysql.Connection()
+        cnn.connect (DB_HOST, 3306, DB_USER, DB_PASSWD, DB_DB)
+        rs = cnn.query("SELECT * FROM `tblautoincint` WHERE `test_id` LIKE '%%10%%'")
+        self.assertEquals([(100, u'piet'), (101, u'piet')], rs.rows)
+
+        rs = cnn.query("SELECT * FROM `tblautoincint` WHERE `test_id` LIKE '%%%s%%'", [10])
+        self.assertEquals([(100, u'piet'), (101, u'piet')], rs.rows)
+
+        # SqlAlchemy query style
+        rs = cnn.query("SELECT * FROM `tblautoincint` WHERE `test_id` LIKE concat(concat('%%', %s), '%%')", [10])
+        self.assertEquals([(100, u'piet'), (101, 'piet')], rs.rows)
+
+        cnn.close()
+
 if __name__ == '__main__':
     from guppy import hpy
     hp = hpy()