Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-sql / tokenizer / icu_tokenizer_tables.sql

diff --git a/lib-sql/tokenizer/icu_tokenizer_tables.sql b/lib-sql/tokenizer/icu_tokenizer_tables.sql
index 13e1bdb0c5ef520758da15589a01d6cbb0d40555..7ec3c6f891c958d5eb43de3df91faba6ea30a37c 100644 (file)
--- a/lib-sql/tokenizer/icu_tokenizer_tables.sql
+++ b/lib-sql/tokenizer/icu_tokenizer_tables.sql
@@ -1,13 +1,27 @@
 DROP TABLE IF EXISTS word;
 DROP TABLE IF EXISTS word;

-CREATE TABLE word_icu (
+CREATE TABLE word (

   word_id INTEGER,
   word_token text NOT NULL,
   type text NOT NULL,
   word_id INTEGER,
   word_token text NOT NULL,
   type text NOT NULL,

+  word text,

   info jsonb
 ) {{db.tablespace.search_data}};
 
 CREATE INDEX idx_word_word_token ON word
     USING BTREE (word_token) {{db.tablespace.search_index}};
   info jsonb
 ) {{db.tablespace.search_data}};
 
 CREATE INDEX idx_word_word_token ON word
     USING BTREE (word_token) {{db.tablespace.search_index}};

+-- Used when updating country names from the boundary relation.
+CREATE INDEX idx_word_country_names ON word
+    USING btree(word) {{db.tablespace.address_index}}
+    WHERE type = 'C';
+-- Used when inserting new postcodes on updates.
+CREATE INDEX idx_word_postcodes ON word
+    USING btree(word) {{db.tablespace.address_index}}
+    WHERE type = 'P';
+-- Used when inserting full words.
+CREATE INDEX idx_word_full_word ON word
+    USING btree(word) {{db.tablespace.address_index}}
+    WHERE type = 'W';
+

 GRANT SELECT ON word TO "{{config.DATABASE_WEBUSER}}";
 
 DROP SEQUENCE IF EXISTS seq_word;
 GRANT SELECT ON word TO "{{config.DATABASE_WEBUSER}}";
 
 DROP SEQUENCE IF EXISTS seq_word;