also enable flake for tests in github actions

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

diff --git a/test/python/cursor.py b/test/python/cursor.py
index 73b83b1df840b3842bbb099ce9d5c2cc5c3af887..5dc93cd57e3bd66cf1c5d516d2258e1dc7f2c780 100644 (file)
--- a/test/python/cursor.py
+++ b/test/python/cursor.py
@@ -1,15 +1,16 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2025 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.
     """
@@ -22,7 +23,6 @@ class CursorForTesting(psycopg2.extras.DictCursor):
         assert self.rowcount == 1
         return self.fetchone()[0]
 
-
     def row_set(self, sql, params=None):
         """ Execute a query and return the result as a set of tuples.
             Fails when the SQL command returns duplicate rows.
@@ -34,7 +34,6 @@ class CursorForTesting(psycopg2.extras.DictCursor):
 
         return result
 
-
     def table_exists(self, table):
         """ Check that a table with the given name exists in the database.
         """
@@ -42,7 +41,6 @@ class CursorForTesting(psycopg2.extras.DictCursor):
                              WHERE tablename = %s""", (table, ))
         return num == 1
 
-
     def index_exists(self, table, index):
         """ Check that an indexwith the given name exists on the given table.
         """
@@ -51,7 +49,6 @@ class CursorForTesting(psycopg2.extras.DictCursor):
                           (table, index))
         return num == 1
 
-
     def table_rows(self, table, where=None):
         """ Return the number of rows in the given table.
         """
@@ -59,9 +56,3 @@ class CursorForTesting(psycopg2.extras.DictCursor):
             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)