Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/cursor.py b/test/python/cursor.py
index 9b8ff83b1af9a300efebe9dea2169419be42b759..620cdd98511ddfdbd66923c489dafed6e58934ae 100644 (file)
--- a/test/python/cursor.py
+++ b/test/python/cursor.py
@@ -3,7 +3,7 @@ Specialised psycopg2 cursor with shortcut functions useful for testing.
 """
 import psycopg2.extras
 
 """
 import psycopg2.extras
 

-class TestingCursor(psycopg2.extras.DictCursor):
+class CursorForTesting(psycopg2.extras.DictCursor):

     """ 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 +37,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.
         """