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

fix template expressions for tablespaces

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-10-15 15:07:43 +02:00
parent 75c631f080
commit 552fb16cb2
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/db/sql_preprocessor.py
View File

@@ -36,7 +36,7 @@ def _setup_tablespace_sql(config):
tspace = getattr(config, 'TABLESPACE_{}_{}'.format(subset, kind)) tspace = getattr(config, 'TABLESPACE_{}_{}'.format(subset, kind))
if tspace: if tspace:
tspace = 'TABLESPACE "{}"'.format(tspace) tspace = 'TABLESPACE "{}"'.format(tspace)
out['{}_{}'.format(subset.lower, kind.lower())] = tspace out['{}_{}'.format(subset.lower(), kind.lower())] = tspace
return out return out

9
test/python/conftest.py
View File

@@ -226,14 +226,19 @@ def osm2pgsql_options(temp_db):
tablespaces=dict(slim_data='', slim_index='', tablespaces=dict(slim_data='', slim_index='',
main_data='', main_index='')) main_data='', main_index=''))
@pytest.fixture @pytest.fixture
def sql_preprocessor(temp_db_conn, tmp_path, table_factory, temp_db_with_extensions): def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, ))) table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
cfg = Configuration(None, SRC_DIR.resolve() / 'settings') cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php', cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php',
sql=tmp_path, data=SRC_DIR / 'data') sql=tmp_path, data=SRC_DIR / 'data')
return cfg
return SQLPreprocessor(temp_db_conn, cfg)
@pytest.fixture
def sql_preprocessor(sql_preprocessor_cfg, temp_db_conn):
return SQLPreprocessor(temp_db_conn, sql_preprocessor_cfg)
@pytest.fixture @pytest.fixture

15
test/python/test_db_sql_preprocessor.py
View File

@@ -3,6 +3,8 @@ Tests for SQL preprocessing.
""" """
import pytest import pytest
from nominatim.db.sql_preprocessor import SQLPreprocessor
@pytest.fixture @pytest.fixture
def sql_factory(tmp_path): def sql_factory(tmp_path):
def _mk_sql(sql_body): def _mk_sql(sql_body):
@@ -22,11 +24,20 @@ def sql_factory(tmp_path):
("'{{db.partitions|join}}'", '012'), ("'{{db.partitions|join}}'", '012'),
("{% if 'country_name' in db.tables %}'yes'{% else %}'no'{% endif %}", "yes"), ("{% if 'country_name' in db.tables %}'yes'{% else %}'no'{% endif %}", "yes"),
("{% if 'xxx' in db.tables %}'yes'{% else %}'no'{% endif %}", "no"), ("{% if 'xxx' in db.tables %}'yes'{% else %}'no'{% endif %}", "no"),
("'{{db.tablespace.address_data}}'", ""),
("'{{db.tablespace.search_data}}'", 'TABLESPACE "dsearch"'),
("'{{db.tablespace.address_index}}'", 'TABLESPACE "iaddress"'),
("'{{db.tablespace.aux_data}}'", 'TABLESPACE "daux"')
]) ])
def test_load_file_simple(sql_preprocessor, sql_factory, temp_db_conn, temp_db_cursor, expr, ret): def test_load_file_simple(sql_preprocessor_cfg, sql_factory,
temp_db_conn, temp_db_cursor, monkeypatch,
expr, ret):
monkeypatch.setenv('NOMINATIM_TABLESPACE_SEARCH_DATA', 'dsearch')
monkeypatch.setenv('NOMINATIM_TABLESPACE_ADDRESS_INDEX', 'iaddress')
monkeypatch.setenv('NOMINATIM_TABLESPACE_AUX_DATA', 'daux')
sqlfile = sql_factory("RETURN {};".format(expr)) sqlfile = sql_factory("RETURN {};".format(expr))
sql_preprocessor.run_sql_file(temp_db_conn, sqlfile) SQLPreprocessor(temp_db_conn, sql_preprocessor_cfg).run_sql_file(temp_db_conn, sqlfile)
assert temp_db_cursor.scalar('SELECT test()') == ret assert temp_db_cursor.scalar('SELECT test()') == ret