Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index a0ad66a8353d814754d5cd6e576c976865f8b7c1..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" ;


@@ -234,17 +221,7 @@ CREATE TRIGGER place_before_delete BEFORE DELETE ON place
 CREATE TRIGGER place_before_insert BEFORE INSERT ON place
     FOR EACH ROW EXECUTE PROCEDURE place_insert();
 
 CREATE TRIGGER place_before_insert BEFORE INSERT ON place
     FOR EACH ROW EXECUTE PROCEDURE place_insert();
 

-alter table placex add column geometry_sector INTEGER;
-alter table placex add column indexed_status INTEGER;
-alter table placex add column indexed_date TIMESTAMP;
-
-update placex set geometry_sector = geometry_sector(geometry);
-drop index idx_placex_pendingbylatlon;
-drop index idx_placex_interpolation;

 drop index idx_placex_sector;
 drop index idx_placex_sector;

-CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search) TABLESPACE ssd
-  where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
-CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) TABLESPACE ssd where indexed = false and class='place' and type='houses';

 CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id) TABLESPACE ssd;
 
 DROP SEQUENCE seq_postcodes;
 CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id) TABLESPACE ssd;
 
 DROP SEQUENCE seq_postcodes;


@@ -264,6 +241,7 @@ CREATE TABLE import_polygon_error (
 SELECT AddGeometryColumn('import_polygon_error', 'prevgeometry', 4326, 'GEOMETRY', 2);
 SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY', 2);
 CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id) TABLESPACE ssd;
 SELECT AddGeometryColumn('import_polygon_error', 'prevgeometry', 4326, 'GEOMETRY', 2);
 SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY', 2);
 CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id) TABLESPACE ssd;

+GRANT SELECT ON import_polygon_error TO "www-data";

 
 drop table import_polygon_delete;
 CREATE TABLE import_polygon_delete (
 
 drop table import_polygon_delete;
 CREATE TABLE import_polygon_delete (


@@ -273,6 +251,7 @@ CREATE TABLE import_polygon_delete (
   type TEXT NOT NULL
   );
 CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id) TABLESPACE ssd;
   type TEXT NOT NULL
   );
 CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id) TABLESPACE ssd;

+GRANT SELECT ON import_polygon_delete TO "www-data";

 
 drop sequence file;
 CREATE SEQUENCE file start 1;
 
 drop sequence file;
 CREATE SEQUENCE file start 1;