X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3788d765ed4e7ddf00794085af757714bc102cf..44d5148e5fb203ec88fbf56433a6cb93c4b1d209:/test/python/db/test_utils.py diff --git a/test/python/db/test_utils.py b/test/python/db/test_utils.py index 3991dff3..2eef1bd9 100644 --- a/test/python/db/test_utils.py +++ b/test/python/db/test_utils.py @@ -1,8 +1,8 @@ -# 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. """ Tests for DB utility functions in db.utils @@ -11,8 +11,8 @@ import json import pytest -import nominatim.db.utils as db_utils -from nominatim.errors import UsageError +import nominatim_core.db.utils as db_utils +from nominatim_core.errors import UsageError def test_execute_file_success(dsn, temp_db_cursor, tmp_path): tmpfile = tmp_path / 'test.sql' @@ -65,7 +65,7 @@ class TestCopyBuffer: @pytest.fixture(autouse=True) def setup_test_table(self, table_factory): - table_factory(self.TABLE_NAME, 'colA INT, colB TEXT') + table_factory(self.TABLE_NAME, 'col_a INT, col_b TEXT') def table_rows(self, cursor): @@ -92,7 +92,7 @@ class TestCopyBuffer: buf.add('foo') buf.copy_out(temp_db_cursor, self.TABLE_NAME, - columns=['colB']) + columns=['col_b']) assert self.table_rows(temp_db_cursor) == {(None, 'foo')} @@ -103,7 +103,7 @@ class TestCopyBuffer: buf.add(' two ', 2) buf.copy_out(temp_db_cursor, self.TABLE_NAME, - columns=['colB', 'colA']) + columns=['col_b', 'col_a']) assert self.table_rows(temp_db_cursor) == {(1, 'one'), (2, ' two ')} @@ -115,7 +115,7 @@ class TestCopyBuffer: buf.add('\\N') buf.copy_out(temp_db_cursor, self.TABLE_NAME, - columns=['colB']) + columns=['col_b']) assert self.table_rows(temp_db_cursor) == {(None, 'foo\tbar'), (None, 'sun\nson'), @@ -128,7 +128,7 @@ class TestCopyBufferJson: @pytest.fixture(autouse=True) def setup_test_table(self, table_factory): - table_factory(self.TABLE_NAME, 'colA INT, colB JSONB') + table_factory(self.TABLE_NAME, 'col_a INT, col_b JSONB') def table_rows(self, cursor):