mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-02-14 01:47:57 +00:00
Restore grants for dynamic tables in tokenizer, migration, and tiger import
This commit is contained in:
@@ -42,9 +42,4 @@ GRANT SELECT ON country_osm_grid TO "{{config.DATABASE_WEBUSER}}";
|
|||||||
-- Tokenizer tables (word table)
|
-- Tokenizer tables (word table)
|
||||||
{% if 'word' in db.tables %}
|
{% if 'word' in db.tables %}
|
||||||
GRANT SELECT ON word TO "{{config.DATABASE_WEBUSER}}";
|
GRANT SELECT ON word TO "{{config.DATABASE_WEBUSER}}";
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
-- Tiger import table (if exists)
|
|
||||||
{% if 'location_property_tiger_import' in db.tables %}
|
|
||||||
GRANT SELECT ON location_property_tiger_import TO "{{config.DATABASE_WEBUSER}}";
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -13,6 +13,8 @@ CREATE INDEX IF NOT EXISTS idx_location_property_tiger_parent_place_id_imp
|
|||||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_location_property_tiger_place_id_imp
|
CREATE UNIQUE INDEX IF NOT EXISTS idx_location_property_tiger_place_id_imp
|
||||||
ON location_property_tiger_import (place_id) {{db.tablespace.aux_index}};
|
ON location_property_tiger_import (place_id) {{db.tablespace.aux_index}};
|
||||||
|
|
||||||
|
GRANT SELECT ON location_property_tiger_import TO "{{config.DATABASE_WEBUSER}}";
|
||||||
|
|
||||||
DROP TABLE IF EXISTS location_property_tiger;
|
DROP TABLE IF EXISTS location_property_tiger;
|
||||||
ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
|
ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
|
||||||
|
|
||||||
|
|||||||
@@ -144,6 +144,10 @@ class ICUTokenizer(AbstractTokenizer):
|
|||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
cur.execute('SET max_parallel_workers_per_gather TO 0')
|
cur.execute('SET max_parallel_workers_per_gather TO 0')
|
||||||
|
|
||||||
|
sqlp = SQLPreprocessor(conn, config)
|
||||||
|
sqlp.run_string(conn,
|
||||||
|
'GRANT SELECT ON tmp_word TO "{{config.DATABASE_WEBUSER}}"')
|
||||||
|
conn.commit()
|
||||||
self._create_base_indices(config, 'tmp_word')
|
self._create_base_indices(config, 'tmp_word')
|
||||||
self._create_lookup_indices(config, 'tmp_word')
|
self._create_lookup_indices(config, 'tmp_word')
|
||||||
self._move_temporary_word_table('tmp_word')
|
self._move_temporary_word_table('tmp_word')
|
||||||
@@ -241,9 +245,11 @@ class ICUTokenizer(AbstractTokenizer):
|
|||||||
word text,
|
word text,
|
||||||
info jsonb
|
info jsonb
|
||||||
) {{db.tablespace.search_data}};
|
) {{db.tablespace.search_data}};
|
||||||
|
GRANT SELECT ON word TO "{{config.DATABASE_WEBUSER}}";
|
||||||
|
|
||||||
DROP SEQUENCE IF EXISTS seq_word;
|
DROP SEQUENCE IF EXISTS seq_word;
|
||||||
CREATE SEQUENCE seq_word start 1;
|
CREATE SEQUENCE seq_word start 1;
|
||||||
|
GRANT SELECT ON seq_word to "{{config.DATABASE_WEBUSER}}";
|
||||||
""")
|
""")
|
||||||
conn.commit()
|
conn.commit()
|
||||||
|
|
||||||
|
|||||||
@@ -137,6 +137,7 @@ def create_placex_entrance_table(conn: Connection, config: Configuration, **_: A
|
|||||||
);
|
);
|
||||||
CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance
|
CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance
|
||||||
USING BTREE (place_id, osm_id) {{db.tablespace.search_index}};
|
USING BTREE (place_id, osm_id) {{db.tablespace.search_index}};
|
||||||
|
GRANT SELECT ON placex_entrance TO "{{config.DATABASE_WEBUSER}}" ;
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
|
||||||
@@ -249,6 +250,8 @@ def create_place_postcode_table(conn: Connection, config: Configuration, **_: An
|
|||||||
geometry Geometry(Geometry, 4326) NOT NULL
|
geometry Geometry(Geometry, 4326) NOT NULL
|
||||||
)
|
)
|
||||||
""")
|
""")
|
||||||
|
sqlp.run_string(conn,
|
||||||
|
'GRANT SELECT ON location_postcodes TO "{{config.DATABASE_WEBUSER}}"')
|
||||||
# remove postcodes from the various auxillary tables
|
# remove postcodes from the various auxillary tables
|
||||||
cur.execute(
|
cur.execute(
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user