X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/efafa5271957fb54b356ec1c90e8613f14de40d4..d77aa7dfc9541bffa0109da89b95f296e751aea0:/test/python/cursor.py diff --git a/test/python/cursor.py b/test/python/cursor.py index 73b83b1d..b3fc260a 100644 --- a/test/python/cursor.py +++ b/test/python/cursor.py @@ -1,15 +1,15 @@ -# 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) 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. """ @@ -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)) - - - def execute_values(self, *args, **kwargs): - """ Execute the execute_values() function on the cursor. - """ - psycopg2.extras.execute_values(self, *args, **kwargs)