Develop-Python
diff --git a/‎procrastinate/psycopg2_connector.py
Lines changed: 13 additions & 3 deletions b/‎procrastinate/psycopg2_connector.py
Lines changed: 13 additions & 3 deletions
diff --git a/‎tests/integration/test_psycopg2_connector.py
Lines changed: 18 additions & 0 deletions b/‎tests/integration/test_psycopg2_connector.py
Lines changed: 18 additions & 0 deletions
@@ -1,6 +1,7 @@
 import contextlib
 import functools
 import logging
+import re
 from typing import Any, Callable, Dict, Optional
 
 import psycopg2
@@ -66,6 +67,9 @@ def wrapped(*args, **kwargs):
     return wrapped
 
 
+PERCENT_PATTERN = re.compile(r"%(?![\(s])")
+
+
 class Psycopg2Connector(connector.BaseConnector):
     @wrap_exceptions
     def __init__(
@@ -201,20 +205,26 @@ def _connection(self) -> psycopg2.extensions.connection:
     def execute_query(self, query: str, **arguments: Any) -> None:
         with self._connection() as connection:
             with connection.cursor() as cursor:
-                cursor.execute(query, self._wrap_json(arguments))
+                cursor.execute(
+                    PERCENT_PATTERN.sub("%%", query), self._wrap_json(arguments)
+                )
 
     @wrap_exceptions
     @wrap_query_exceptions
     def execute_query_one(self, query: str, **arguments: Any) -> Dict[str, Any]:
         with self._connection() as connection:
             with connection.cursor() as cursor:
-                cursor.execute(query, self._wrap_json(arguments))
+                cursor.execute(
+                    PERCENT_PATTERN.sub("%%", query), self._wrap_json(arguments)
+                )
                 return cursor.fetchone()
 
     @wrap_exceptions
     @wrap_query_exceptions
     def execute_query_all(self, query: str, **arguments: Any) -> Dict[str, Any]:
         with self._connection() as connection:
             with connection.cursor() as cursor:
-                cursor.execute(query, self._wrap_json(arguments))
+                cursor.execute(
+                    PERCENT_PATTERN.sub("%%", query), self._wrap_json(arguments)
+                )
                 return cursor.fetchall()
@@ -91,6 +91,24 @@ def test_execute_query(psycopg2_connector):
     assert result == [{"obj_description": "foo"}]
 
 
+def test_execute_query_percent(psycopg2_connector):
+    psycopg2_connector.execute_query("SELECT '%'")
+    result = psycopg2_connector.execute_query_one("SELECT '%'")
+    assert result == {"?column?": "%"}
+
+    result = psycopg2_connector.execute_query_all("SELECT '%'")
+    assert result == [{"?column?": "%"}]
+
+
+def test_execute_query_arg(psycopg2_connector):
+    psycopg2_connector.execute_query("SELECT %(arg)s", arg=1)
+    result = psycopg2_connector.execute_query_one("SELECT %(arg)s", arg=1)
+    assert result == {"?column?": 1}
+
+    result = psycopg2_connector.execute_query_all("SELECT %(arg)s", arg=1)
+    assert result == [{"?column?": 1}]
+
+
 def test_close(psycopg2_connector):
     pool = psycopg2_connector._pool
     psycopg2_connector.close()