Merge pull request #3492 from lonvia/drop-waste-disposal

[nominatim.git] / test / python / tools / test_migration.py

diff --git a/test/python/tools/test_migration.py b/test/python/tools/test_migration.py
index d33ff4223613a8d4d4280fab346cdf135c9e22b3..2c7b2d5664cbf16591a848934e87ac9bf72a680e 100644 (file)
--- a/test/python/tools/test_migration.py
+++ b/test/python/tools/test_migration.py
@@ -8,10 +8,10 @@
 Tests for migration functions
 """
 import pytest
 Tests for migration functions
 """
 import pytest

-import psycopg2.extras

 
 from nominatim_db.tools import migration
 
 from nominatim_db.tools import migration

-from nominatim_core.errors import UsageError
+from nominatim_db.errors import UsageError
+from nominatim_db.db.connection import server_version_tuple

 import nominatim_db.version
 
 from mock_legacy_word_table import MockLegacyWordTable
 import nominatim_db.version
 
 from mock_legacy_word_table import MockLegacyWordTable


@@ -43,7 +43,6 @@ def test_no_migration_old_versions(temp_db_with_extensions, table_factory, def_c
 def test_set_up_migration_for_36(temp_db_with_extensions, temp_db_cursor,
                                  table_factory, def_config, monkeypatch,
                                  postprocess_mock):
 def test_set_up_migration_for_36(temp_db_with_extensions, temp_db_cursor,
                                  table_factory, def_config, monkeypatch,
                                  postprocess_mock):

-    psycopg2.extras.register_hstore(temp_db_cursor)

     # don't actually run any migration, except the property table creation
     monkeypatch.setattr(migration, '_MIGRATION_FUNCTIONS',
                         [((3, 5, 0, 99), migration.add_nominatim_property_table)])
     # don't actually run any migration, except the property table creation
     monkeypatch.setattr(migration, '_MIGRATION_FUNCTIONS',
                         [((3, 5, 0, 99), migration.add_nominatim_property_table)])


@@ -63,7 +62,7 @@ def test_set_up_migration_for_36(temp_db_with_extensions, temp_db_cursor,
                                           WHERE property = 'database_version'""")
 
 
                                           WHERE property = 'database_version'""")
 
 

-def test_already_at_version(def_config, property_table):
+def test_already_at_version(temp_db_with_extensions, def_config, property_table):

 
     property_table.set('database_version',
                        str(nominatim_db.version.NOMINATIM_VERSION))
 
     property_table.set('database_version',
                        str(nominatim_db.version.NOMINATIM_VERSION))


@@ -71,8 +70,8 @@ def test_already_at_version(def_config, property_table):
     assert migration.migrate(def_config, {}) == 0
 
 
     assert migration.migrate(def_config, {}) == 0
 
 

-def test_run_single_migration(def_config, temp_db_cursor, property_table,
-                              monkeypatch, postprocess_mock):
+def test_run_single_migration(temp_db_with_extensions, def_config, temp_db_cursor,
+                              property_table, monkeypatch, postprocess_mock):

     oldversion = [x for x in nominatim_db.version.NOMINATIM_VERSION]
     oldversion[0] -= 1
     property_table.set('database_version',
     oldversion = [x for x in nominatim_db.version.NOMINATIM_VERSION]
     oldversion[0] -= 1
     property_table.set('database_version',


@@ -226,7 +225,7 @@ def test_create_tiger_housenumber_index(temp_db_conn, temp_db_cursor, table_fact
     migration.create_tiger_housenumber_index(temp_db_conn)
     temp_db_conn.commit()
 
     migration.create_tiger_housenumber_index(temp_db_conn)
     temp_db_conn.commit()
 

-    if temp_db_conn.server_version_tuple() >= (11, 0, 0):
+    if server_version_tuple(temp_db_conn) >= (11, 0, 0):

         assert temp_db_cursor.index_exists('location_property_tiger',
                                            'idx_location_property_tiger_housenumber_migrated')
 
         assert temp_db_cursor.index_exists('location_property_tiger',
                                            'idx_location_property_tiger_housenumber_migrated')