safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests 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

9
test/python/conftest.py
View File

@@ -226,14 +226,19 @@ def osm2pgsql_options(temp_db):
tablespaces=dict(slim_data='', slim_index='',
main_data='', main_index=''))
@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, )))
cfg = Configuration(None, SRC_DIR.resolve() / 'settings')
cfg.set_libdirs(module='.', osm2pgsql='.', php=SRC_DIR / 'lib-php',
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