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 9b8ff83b1af9a300efebe9dea2169419be42b759..b3fc260a2526d016ae2607e681e702baaddb591e 100644 (file)
--- a/test/python/cursor.py
+++ b/test/python/cursor.py
@@ -1,9 +1,15 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# 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 TestingCursor(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.
     """


@@ -37,6 +43,15 @@ class TestingCursor(psycopg2.extras.DictCursor):
         return num == 1
 
 
         return num == 1
 
 

+    def index_exists(self, table, index):
+        """ Check that an indexwith the given name exists on the given table.
+        """
+        num = self.scalar("""SELECT count(*) FROM pg_indexes
+                             WHERE tablename = %s and indexname = %s""",
+                          (table, index))
+        return num == 1
+
+

     def table_rows(self, table, where=None):
         """ Return the number of rows in the given table.
         """
     def table_rows(self, table, where=None):
         """ Return the number of rows in the given table.
         """


@@ -44,9 +59,3 @@ class TestingCursor(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)