adding prefix to keys is now more configurable

This commit is contained in:
Tareq Al-Ahdal
2022-03-18 06:20:00 +08:00
parent 943e5fe699
commit fa2aca1cbc

View File

@@ -66,8 +66,8 @@ def setup_country_tables(dsn, sql_dir, ignore_partitions=False):
""" """
db_utils.execute_file(dsn, sql_dir / 'country_osm_grid.sql.gz') db_utils.execute_file(dsn, sql_dir / 'country_osm_grid.sql.gz')
def prepend_name_to_keys(name): def add_prefix_to_keys(name, prefix):
return {'name:'+k: v for k, v in name.items()} return {prefix+k: v for k, v in name.items()}
params, country_names_data = [], '' params, country_names_data = [], ''
for ccode, props in _COUNTRY_INFO.items(): for ccode, props in _COUNTRY_INFO.items():
@@ -79,10 +79,9 @@ def setup_country_tables(dsn, sql_dir, ignore_partitions=False):
lang = props['languages'][0] if len(props['languages']) == 1 else None lang = props['languages'][0] if len(props['languages']) == 1 else None
params.append((ccode, partition, lang)) params.append((ccode, partition, lang))
name = prepend_name_to_keys(props.get('names').get('name')) name = add_prefix_to_keys(props.get('names').get('name'), 'name:')
name = json.dumps(name , ensure_ascii=False, separators=(', ', '=>')) name = json.dumps(name , ensure_ascii=False, separators=(', ', '=>'))
country_names_data += ccode + '\t' + name[1:-1] + '\n' country_names_data += ccode + '\t' + name[1:-1] + '\n'
with connect(dsn) as conn: with connect(dsn) as conn:
with conn.cursor() as cur: with conn.cursor() as cur:
cur.execute( cur.execute(