Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index 385e1fc90d1fcba3fa7ba0329f72bd59d94cbe73..ccca8f138f044485314bdeec244da80f695d3d29 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -1,10 +1,10 @@
-drop table import_status;
+drop table if exists import_status;

 CREATE TABLE import_status (
   lastimportdate timestamp NOT NULL
   );
 CREATE TABLE import_status (
   lastimportdate timestamp NOT NULL
   );

-GRANT SELECT ON import_status TO "www-data" ;
+GRANT SELECT ON import_status TO "{www-user}" ;

 
 

-drop table import_osmosis_log;
+drop table if exists import_osmosis_log;

 CREATE TABLE import_osmosis_log (
   batchend timestamp,
   batchsize integer,
 CREATE TABLE import_osmosis_log (
   batchend timestamp,
   batchsize integer,


@@ -13,7 +13,7 @@ CREATE TABLE import_osmosis_log (
   event text
   );
 
   event text
   );
 

-drop table import_npi_log;
+drop table if exists import_npi_log;

 CREATE TABLE import_npi_log (
   npiid integer,
   batchend timestamp,
 CREATE TABLE import_npi_log (
   npiid integer,
   batchend timestamp,


@@ -23,18 +23,6 @@ CREATE TABLE import_npi_log (
   event text
   );
 
   event text
   );
 

---drop table IF EXISTS query_log;
-CREATE TABLE query_log (
-  starttime timestamp,
-  query text,
-  ipaddress text,
-  endtime timestamp,
-  results integer
-  );
-CREATE INDEX idx_query_log ON query_log USING BTREE (starttime);
-GRANT INSERT ON query_log TO "www-data" ;
-GRANT UPDATE ON query_log TO "www-data" ;
-

 CREATE TABLE new_query_log (
   type text,
   starttime timestamp,
 CREATE TABLE new_query_log (
   type text,
   starttime timestamp,


@@ -42,53 +30,41 @@ CREATE TABLE new_query_log (
   useragent text,
   language text,
   query text,
   useragent text,
   language text,
   query text,

+  searchterm text,

   endtime timestamp,
   results integer,
   format text,
   secret text
   );
 CREATE INDEX idx_new_query_log_starttime ON new_query_log USING BTREE (starttime);
   endtime timestamp,
   results integer,
   format text,
   secret text
   );
 CREATE INDEX idx_new_query_log_starttime ON new_query_log USING BTREE (starttime);

-GRANT INSERT ON new_query_log TO "www-data" ;
-GRANT UPDATE ON new_query_log TO "www-data" ;
-GRANT SELECT ON new_query_log TO "www-data" ;
-
-create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as 
-useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
+GRANT INSERT ON new_query_log TO "{www-user}" ;
+GRANT UPDATE ON new_query_log TO "{www-user}" ;
+GRANT SELECT ON new_query_log TO "{www-user}" ;

 
 

---drop table IF EXISTS report_log;
-CREATE TABLE report_log (
-  starttime timestamp,
-  ipaddress text,
-  query text,
-  description text,
-  email text
-  );
-GRANT INSERT ON report_log TO "www-data" ;
+GRANT SELECT ON TABLE country_name TO "{www-user}";
+GRANT SELECT ON TABLE gb_postcode TO "{www-user}";

 
 drop table IF EXISTS word;
 CREATE TABLE word (
   word_id INTEGER,
   word_token text,
 
 drop table IF EXISTS word;
 CREATE TABLE word (
   word_id INTEGER,
   word_token text,

-  word_trigram text,

   word text,
   class text,
   type text,
   country_code varchar(2),
   search_name_count INTEGER,
   operator TEXT
   word text,
   class text,
   type text,
   country_code varchar(2),
   search_name_count INTEGER,
   operator TEXT

-  );
-SELECT AddGeometryColumn('word', 'location', 4326, 'GEOMETRY', 2);
-CREATE INDEX idx_word_word_token on word USING BTREE (word_token);
---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;
+  ) {ts:search-data};
+CREATE INDEX idx_word_word_token on word USING BTREE (word_token) {ts:search-index};
+GRANT SELECT ON word TO "{www-user}" ;
+DROP SEQUENCE IF EXISTS seq_word;

 CREATE SEQUENCE seq_word start 1;
 
 drop table IF EXISTS location_area CASCADE;
 CREATE TABLE location_area (
   partition integer,
   place_id BIGINT,
 CREATE SEQUENCE seq_word start 1;
 
 drop table IF EXISTS location_area CASCADE;
 CREATE TABLE location_area (
   partition integer,
   place_id BIGINT,

-  country_code VARCHAR(2), 
+  country_code VARCHAR(2),

   keywords INTEGER[],
   rank_search INTEGER NOT NULL,
   rank_address INTEGER NOT NULL,
   keywords INTEGER[],
   rank_search INTEGER NOT NULL,
   rank_address INTEGER NOT NULL,


@@ -98,8 +74,6 @@ SELECT AddGeometryColumn('location_area', 'centroid', 4326, 'POINT', 2);
 SELECT AddGeometryColumn('location_area', 'geometry', 4326, 'GEOMETRY', 2);
 
 CREATE TABLE location_area_large () INHERITS (location_area);
 SELECT AddGeometryColumn('location_area', 'geometry', 4326, 'GEOMETRY', 2);
 
 CREATE TABLE location_area_large () INHERITS (location_area);

-CREATE TABLE location_area_roadnear () INHERITS (location_area);
-CREATE TABLE location_area_roadfar () INHERITS (location_area);

 
 drop table IF EXISTS location_property CASCADE;
 CREATE TABLE location_property (
 
 drop table IF EXISTS location_property CASCADE;
 CREATE TABLE location_property (


@@ -115,16 +89,16 @@ CREATE TABLE location_property_aux () INHERITS (location_property);
 CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
 CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux USING BTREE (parent_place_id);
 CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber);
 CREATE INDEX idx_location_property_aux_place_id ON location_property_aux USING BTREE (place_id);
 CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux USING BTREE (parent_place_id);
 CREATE INDEX idx_location_property_aux_housenumber_parent_place_id ON location_property_aux USING BTREE (parent_place_id, housenumber);

-GRANT SELECT ON location_property_aux TO "www-data";
+GRANT SELECT ON location_property_aux TO "{www-user}";

 
 

-CREATE TABLE location_property_tiger () INHERITS (location_property);
-CREATE INDEX idx_location_property_tiger_place_id ON location_property_tiger USING BTREE (place_id);
-CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_tiger USING BTREE (parent_place_id);
-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 TABLE location_property_tiger () INHERITS (location_property) {ts:aux-data};
+CREATE INDEX idx_location_property_tiger_place_id ON location_property_tiger USING BTREE (place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_tiger_parent_place_id ON location_property_tiger USING BTREE (parent_place_id) {ts:aux-index};
+CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id ON location_property_tiger USING BTREE (parent_place_id, housenumber) {ts:aux-index};
+GRANT SELECT ON location_property_tiger TO "{www-user}";

 
 

-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,


@@ -132,13 +106,9 @@ CREATE TABLE search_name_blank (
   country_code varchar(2),
   name_vector integer[],
   nameaddress_vector integer[]
   country_code varchar(2),
   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);
-CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id);
-CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector) WITH (fastupdate = off);
+  ) {ts:search-data};
+SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
+CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id) {ts:search-index};

 
 drop table IF EXISTS place_addressline;
 CREATE TABLE place_addressline (
 
 drop table IF EXISTS place_addressline;
 CREATE TABLE place_addressline (


@@ -148,61 +118,14 @@ CREATE TABLE place_addressline (
   isaddress boolean,
   distance float,
   cached_rank_address integer
   isaddress boolean,
   distance float,
   cached_rank_address integer

-  );
-CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id);
-
-drop table IF EXISTS place_boundingbox CASCADE;
-CREATE TABLE place_boundingbox (
-  place_id BIGINT,
-  minlat float,
-  maxlat float,
-  minlon float,
-  maxlon float,
-  numfeatures integer,
-  area float
-  );
-SELECT AddGeometryColumn('place_boundingbox', 'outline', 4326, 'GEOMETRY', 2);
-GRANT SELECT on place_boundingbox to "www-data" ;
-GRANT INSERT on place_boundingbox to "www-data" ;
+  ) {ts:search-data};
+CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id) {ts:search-index};

 
 

-drop table IF EXISTS reverse_cache;
-CREATE TABLE reverse_cache (
-  latlonzoomid integer,
-  country_code varchar(2),
-  place_id BIGINT
-  );
-GRANT SELECT on reverse_cache to "www-data" ;
-GRANT INSERT on reverse_cache to "www-data" ;
-CREATE INDEX idx_reverse_cache_latlonzoomid ON reverse_cache USING BTREE (latlonzoomid);
-
-drop table country;
-CREATE TABLE country (
-  country_code varchar(2),
-  country_name hstore,
-  country_default_language_code varchar(2)
-  );
-SELECT AddGeometryColumn('country', 'geometry', 4326, 'POLYGON', 2);
-insert into country select iso3166::varchar(2), 'name:en'->cntry_name, null, 
-  ST_Transform(geometryn(the_geom, generate_series(1, numgeometries(the_geom))), 4326) from worldboundaries;
-CREATE INDEX idx_country_country_code ON country USING BTREE (country_code);
-CREATE INDEX idx_country_geometry ON country USING GIST (geometry);
-
-drop table placex;
+drop table if exists placex;

 CREATE TABLE placex (
   place_id BIGINT NOT NULL,
   partition integer,
 CREATE TABLE placex (
   place_id BIGINT NOT NULL,
   partition integer,

-  osm_type char(1),
-  osm_id BIGINT,
-  class TEXT NOT NULL,
-  type TEXT NOT NULL,
-  name HSTORE,
-  admin_level INTEGER,
-  housenumber TEXT,
-  street TEXT,
-  isin TEXT,
-  postcode TEXT,
-  country_code varchar(2),
-  extratags HSTORE,
+  LIKE place INCLUDING CONSTRAINTS,

   parent_place_id BIGINT,
   linked_place_id BIGINT,
   rank_address INTEGER,
   parent_place_id BIGINT,
   linked_place_id BIGINT,
   rank_address INTEGER,


@@ -210,37 +133,27 @@ CREATE TABLE placex (
   importance FLOAT,
   indexed_status INTEGER,
   indexed_date TIMESTAMP,
   importance FLOAT,
   indexed_status INTEGER,
   indexed_date TIMESTAMP,

-  geometry_sector INTEGER
-  );
-SELECT AddGeometryColumn('placex', 'geometry', 4326, 'GEOMETRY', 2);
+  wikipedia TEXT, -- calculated wikipedia article name (language:title)
+  geometry_sector INTEGER,
+  calculated_country_code varchar(2)
+  ) {ts:search-data};

 SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
 SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);

-CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id);
-CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id);
-CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id);
-CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector);
-CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry);
-
---CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed);
-
---CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search)  where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
-
-DROP SEQUENCE seq_place;
+CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index};
+CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) {ts:search-index};
+CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) {ts:address-index};
+CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) {ts:address-index};
+CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) {ts:search-index};
+CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) {ts:address-index} WHERE osm_type='N' and rank_search < 26;
+
+DROP SEQUENCE IF EXISTS seq_place;

 CREATE SEQUENCE seq_place start 1;
 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 DELETE on search_name to "www-data" ;
-GRANT INSERT on search_name 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 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 country to "www-data" ;
+GRANT SELECT on placex to "{www-user}" ;
+GRANT SELECT ON search_name to "{www-user}" ;
+GRANT SELECT on place_addressline to "{www-user}" ;
+GRANT SELECT ON seq_word to "{www-user}" ;
+GRANT SELECT ON planet_osm_ways to "{www-user}" ;
+GRANT SELECT ON planet_osm_rels to "{www-user}" ;
+GRANT SELECT on location_area to "{www-user}" ;

 
 -- insert creates the location tagbles, creates location indexes if indexed == true
 CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex
 
 -- insert creates the location tagbles, creates location indexes if indexed == true
 CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex


@@ -258,19 +171,6 @@ 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;
-CREATE INDEX idx_placex_pendingbylatlon ON placex USING BTREE (geometry_index(geometry_sector,indexed,name),rank_search) 
-  where geometry_index(geometry_sector,indexed,name) IS NOT NULL;
-CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) 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);
-

 DROP SEQUENCE seq_postcodes;
 CREATE SEQUENCE seq_postcodes start 1;
 
 DROP SEQUENCE seq_postcodes;
 CREATE SEQUENCE seq_postcodes start 1;
 


@@ -288,6 +188,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);
 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);

+GRANT SELECT ON import_polygon_error TO "{www-user}";

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


@@ -297,6 +198,32 @@ 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);
   type TEXT NOT NULL
   );
 CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id);

+GRANT SELECT ON import_polygon_delete TO "{www-user}";

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

+
+-- null table so it won't error
+-- deliberately no drop - importing the table is expensive and static, if it is already there better to avoid removing it
+CREATE TABLE wikipedia_article (
+    language text NOT NULL,
+    title text NOT NULL,
+    langcount integer,
+    othercount integer,
+    totalcount integer,
+    lat double precision,
+    lon double precision,
+    importance double precision,
+    osm_type character(1),
+    osm_id bigint
+);
+ALTER TABLE ONLY wikipedia_article ADD CONSTRAINT wikipedia_article_pkey PRIMARY KEY (language, title);
+CREATE INDEX idx_wikipedia_article_osm_id ON wikipedia_article USING btree (osm_type, osm_id);
+
+CREATE TABLE wikipedia_redirect (
+    language text,
+    from_title text,
+    to_title text
+);
+ALTER TABLE ONLY wikipedia_redirect ADD CONSTRAINT wikipedia_redirect_pkey PRIMARY KEY (language, from_title);
+