fix insertion of special terms and countries into word table

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

diff --git a/test/python/test_db_utils.py b/test/python/test_db_utils.py
index b8a49ccf604801ff673d9606c44e8789c24649ed..d549b70f803ec8f7e873e21e8c79f350e73f7af6 100644 (file)
--- a/test/python/test_db_utils.py
+++ b/test/python/test_db_utils.py
@@ -1,7 +1,6 @@
 """
 Tests for DB utility functions in db.utils
 """
 """
 Tests for DB utility functions in db.utils
 """

-import psycopg2

 import pytest
 
 import nominatim.db.utils as db_utils
 import pytest
 
 import nominatim.db.utils as db_utils


@@ -13,10 +12,7 @@ def test_execute_file_success(dsn, temp_db_cursor, tmp_path):
 
     db_utils.execute_file(dsn, tmpfile)
 
 
     db_utils.execute_file(dsn, tmpfile)
 

-    temp_db_cursor.execute('SELECT * FROM test')
-
-    assert temp_db_cursor.rowcount == 1
-    assert temp_db_cursor.fetchone()[0] == 56
+    assert temp_db_cursor.row_set('SELECT * FROM test') == {(56, )}

 
 def test_execute_file_bad_file(dsn, tmp_path):
     with pytest.raises(FileNotFoundError):
 
 def test_execute_file_bad_file(dsn, tmp_path):
     with pytest.raises(FileNotFoundError):


@@ -44,10 +40,7 @@ def test_execute_file_with_pre_code(dsn, tmp_path, temp_db_cursor):
 
     db_utils.execute_file(dsn, tmpfile, pre_code='CREATE TABLE test (id INT)')
 
 
     db_utils.execute_file(dsn, tmpfile, pre_code='CREATE TABLE test (id INT)')
 

-    temp_db_cursor.execute('SELECT * FROM test')
-
-    assert temp_db_cursor.rowcount == 1
-    assert temp_db_cursor.fetchone()[0] == 4
+    assert temp_db_cursor.row_set('SELECT * FROM test') == {(4, )}

 
 
 def test_execute_file_with_post_code(dsn, tmp_path, temp_db_cursor):
 
 
 def test_execute_file_with_post_code(dsn, tmp_path, temp_db_cursor):


@@ -56,7 +49,4 @@ def test_execute_file_with_post_code(dsn, tmp_path, temp_db_cursor):
 
     db_utils.execute_file(dsn, tmpfile, post_code='INSERT INTO test VALUES(23)')
 
 
     db_utils.execute_file(dsn, tmpfile, post_code='INSERT INTO test VALUES(23)')
 

-    temp_db_cursor.execute('SELECT * FROM test')
-
-    assert temp_db_cursor.rowcount == 1
-    assert temp_db_cursor.fetchone()[0] == 23
+    assert temp_db_cursor.row_set('SELECT * FROM test') == {(23, )}