hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-15 02:47:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added fixture for sql_preprocessor and fixed some issues

Browse Source
This commit is contained in:
Darkshredder
2021-03-11 15:39:17 +05:30
parent 8486a83cf5
commit e5719de657
4 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/python/test_tools_tiger_data.py
View File

@@ -10,15 +10,11 @@ from nominatim.tools import tiger_data, database_import
@pytest.mark.parametrize("threads", (1, 5))
def test_add_tiger_data(dsn, src_dir, def_config, monkeypatch,tmp_path,
def test_add_tiger_data(dsn, src_dir, def_config, tmp_path, sql_preprocessor,
temp_db_cursor, threads, temp_db):
monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.')
temp_db_cursor.execute('CREATE EXTENSION hstore')
temp_db_cursor.execute('CREATE EXTENSION postgis')
temp_db_cursor.execute('CREATE TABLE place (id INT)')
database_import.import_base_data('dbname=' + temp_db, src_dir / 'data',
ignore_partitions=False)
sqlfile = tmp_path / '1010.sql'
sqlfile.write_text("""INSERT INTO place values (1)""")
tiger_data.add_tiger_data(dsn, str(tmp_path), threads, def_config, src_dir / 'lib-sql')
@@ -26,15 +22,11 @@ def test_add_tiger_data(dsn, src_dir, def_config, monkeypatch,tmp_path,
assert temp_db_cursor.table_rows('place') == 1
@pytest.mark.parametrize("threads", (1, 5))
def test_add_tiger_data_tarfile(dsn, src_dir, def_config, monkeypatch,tmp_path,
temp_db_cursor, threads, temp_db):
monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.')
def test_add_tiger_data_tarfile(dsn, src_dir, def_config, tmp_path,
temp_db_cursor, threads, temp_db, sql_preprocessor):
temp_db_cursor.execute('CREATE EXTENSION hstore')
temp_db_cursor.execute('CREATE EXTENSION postgis')
temp_db_cursor.execute('CREATE TABLE place (id INT)')
database_import.import_base_data('dbname=' + temp_db, src_dir / 'data',
ignore_partitions=False)
sqlfile = tmp_path / '1010.sql'
sqlfile.write_text("""INSERT INTO place values (1)""")
tar = tarfile.open("sample.tar.gz", "w:gz")