Merge pull request #3492 from lonvia/drop-waste-disposal

[nominatim.git] / test / python / cursor.py

diff --git a/test/python/cursor.py b/test/python/cursor.py
index 7d586b3c1520d9e0fea75cbd144c6111b3c0e58a..b3fc260a2526d016ae2607e681e702baaddb591e 100644 (file)
--- a/test/python/cursor.py
+++ b/test/python/cursor.py
@@ -5,11 +5,11 @@
 # Copyright (C) 2024 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 # Copyright (C) 2024 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """

-Specialised psycopg2 cursor with shortcut functions useful for testing.
+Specialised psycopg cursor with shortcut functions useful for testing.

 """
 """

-import psycopg2.extras
+import psycopg

 
 

-class CursorForTesting(psycopg2.extras.DictCursor):
+class CursorForTesting(psycopg.Cursor):

     """ Extension to the DictCursor class that provides execution
         short-cuts that simplify writing assertions.
     """
     """ Extension to the DictCursor class that provides execution
         short-cuts that simplify writing assertions.
     """


@@ -59,9 +59,3 @@ class CursorForTesting(psycopg2.extras.DictCursor):
             return self.scalar('SELECT count(*) FROM ' + table)
 
         return self.scalar('SELECT count(*) FROM {} WHERE {}'.format(table, where))
             return self.scalar('SELECT count(*) FROM ' + table)
 
         return self.scalar('SELECT count(*) FROM {} WHERE {}'.format(table, where))

-
-
-    def execute_values(self, *args, **kwargs):
-        """ Execute the execute_values() function on the cursor.
-        """
-        psycopg2.extras.execute_values(self, *args, **kwargs)