Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index b5b59c16c1a54f1abfdf4f63ede6377b7e6999a0..32ff5e879e401ffe54b10c54a2e69353159a5a59 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -55,7 +55,6 @@ drop table IF EXISTS word;
 CREATE TABLE word (
   word_id INTEGER,
   word_token text,
 CREATE TABLE word (
   word_id INTEGER,
   word_token text,

-  word_trigram text,

   word text,
   class text,
   type text,
   word text,
   class text,
   type text,


@@ -63,9 +62,7 @@ CREATE TABLE word (
   search_name_count INTEGER,
   operator TEXT
   ) TABLESPACE ssd;
   search_name_count INTEGER,
   operator TEXT
   ) TABLESPACE ssd;

-SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2);

 CREATE INDEX idx_word_word_token on word USING BTREE (word_token) TABLESPACE ssd;
 CREATE INDEX idx_word_word_token on word USING BTREE (word_token) TABLESPACE ssd;

---CREATE INDEX idx_word_trigram ON word USING gin(word_trigram gin_trgm_ops) WITH (fastupdate = off);

 GRANT SELECT ON word TO "www-data" ;
 DROP SEQUENCE seq_word;
 CREATE SEQUENCE seq_word start 1;
 GRANT SELECT ON word TO "www-data" ;
 DROP SEQUENCE seq_word;
 CREATE SEQUENCE seq_word start 1;


@@ -109,8 +106,8 @@ CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_ti
 CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id ON location_property_tiger USING BTREE (parent_place_id, housenumber);
 GRANT SELECT ON location_property_tiger TO "www-data";
 
 CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id ON location_property_tiger USING BTREE (parent_place_id, housenumber);
 GRANT SELECT ON location_property_tiger TO "www-data";
 

-drop table IF EXISTS search_name_blank CASCADE;
-CREATE TABLE search_name_blank (
+drop table IF EXISTS search_name;
+CREATE TABLE search_name (

   place_id BIGINT,
   search_rank integer,
   address_rank integer,
   place_id BIGINT,
   search_rank integer,
   address_rank integer,


@@ -119,10 +116,7 @@ CREATE TABLE search_name_blank (
   name_vector integer[],
   nameaddress_vector integer[]
   );
   name_vector integer[],
   nameaddress_vector integer[]
   );

-SELECT AddGeometryColumn('search_name_blank', 'centroid', 4326, 'GEOMETRY', 2);
-
-drop table IF EXISTS search_name;
-CREATE TABLE search_name () INHERITS (search_name_blank) TABLESPACE ssd;
+SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);

 CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) TABLESPACE ssd;
 
 drop table IF EXISTS place_addressline;
 CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) TABLESPACE ssd;
 
 drop table IF EXISTS place_addressline;


@@ -203,16 +197,9 @@ CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 1;
 GRANT SELECT on placex to "www-data" ;
 DROP SEQUENCE seq_place;
 CREATE SEQUENCE seq_place start 1;
 GRANT SELECT on placex to "www-data" ;

-GRANT UPDATE ON placex to "www-data" ;

 GRANT SELECT ON search_name to "www-data" ;
 GRANT SELECT ON search_name to "www-data" ;

-GRANT DELETE on search_name to "www-data" ;
-GRANT INSERT on search_name to "www-data" ;

 GRANT SELECT on place_addressline to "www-data" ;
 GRANT SELECT on place_addressline to "www-data" ;

-GRANT INSERT ON place_addressline to "www-data" ;
-GRANT DELETE on place_addressline to "www-data" ;

 GRANT SELECT ON seq_word to "www-data" ;
 GRANT SELECT ON seq_word to "www-data" ;

-GRANT UPDATE ON seq_word to "www-data" ;
-GRANT INSERT ON word to "www-data" ;

 GRANT SELECT ON planet_osm_ways to "www-data" ;
 GRANT SELECT ON planet_osm_rels to "www-data" ;
 GRANT SELECT on location_area to "www-data" ;
 GRANT SELECT ON planet_osm_ways to "www-data" ;
 GRANT SELECT ON planet_osm_rels to "www-data" ;
 GRANT SELECT on location_area to "www-data" ;