Apply string interpolation in mogrify regardless of args presence

Author: pmishchenko-ua

singlestoredb/mysql/cursors.py

@@ -183,6 +183,8 @@ def mogrify(self, query, args=None):
 
         if args:
             query = query % self._escape_args(args, conn)
+        else:
+            query = query % ()
 
         return query
 

singlestoredb/tests/test.sql

@@ -708,5 +708,10 @@ INSERT INTO bool_data_with_nulls SET id='nt', bool_a=NULL, bool_b=TRUE;
 INSERT INTO bool_data_with_nulls SET id='nn', bool_a=NULL, bool_b=NULL;
 INSERT INTO bool_data_with_nulls SET id='ff', bool_a=FALSE, bool_b=FALSE;
 
+CREATE TABLE IF NOT EXISTS test_val_with_percent (
+    i VARCHAR(16)
+);
+-- Double percent sign for execution from python
+INSERT INTO test_val_with_percent VALUES ('a%%a');
 
 COMMIT;

singlestoredb/tests/test_connection.py

@@ -3144,6 +3144,24 @@ def test_f16_vectors(self):
             decimal=2,
         )
 
+    def test_mogrify_val_with_percent(self):
+        val_with_percent = 'a%a'
+        self.cur.execute(
+            '''SELECT REPLACE(i, "%%", "\\%%")
+            FROM test_val_with_percent''',
+        )
+        res1 = self.cur.fetchall()
+        assert res1[0][0] == 'a\\%a'
+
+        self.cur.execute(
+            '''SELECT REPLACE(i, "%%", "\\%%")
+            FROM test_val_with_percent
+            WHERE i = %s''',
+            (val_with_percent,),
+        )
+        res2 = self.cur.fetchall()
+        assert res2[0][0] == 'a\\%a'
+
 
 if __name__ == '__main__':
     import nose2