Merge remote-tracking branch 'origin/master' into osmline

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index b27f8e321fa1f52e9c7116ee0d67903bba0b846d..76a4324ff91868b5d2ecf3f2af8f4dc8e1e5851e 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -13,29 +13,6 @@ CREATE TABLE import_osmosis_log (
   event text
   );
 
-drop table if exists import_npi_log;
-CREATE TABLE import_npi_log (
-  npiid integer,
-  batchend timestamp,
-  batchsize integer,
-  starttime timestamp,
-  endtime timestamp,
-  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 SELECT ON query_log TO "{www-user}" ;
-GRANT INSERT ON query_log TO "{www-user}" ;
-GRANT UPDATE ON query_log TO "{www-user}" ;
-
 CREATE TABLE new_query_log (
   type text,
   starttime timestamp,
@@ -43,6 +20,7 @@ CREATE TABLE new_query_log (
   useragent text,
   language text,
   query text,
+  searchterm text,
   endtime timestamp,
   results integer,
   format text,
@@ -53,8 +31,8 @@ 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}" ;
 
-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 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 (
@@ -103,12 +81,29 @@ CREATE INDEX idx_location_property_aux_parent_place_id ON location_property_aux
 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-user}";
 
-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};
+CREATE TABLE location_property_tiger (linegeo GEOMETRY, place_id BIGINT, partition INTEGER, parent_place_id BIGINT, startnumber INTEGER, endnumber INTEGER, interpolationtype TEXT, postcode TEXT);
 GRANT SELECT ON location_property_tiger TO "{www-user}";
 
+CREATE TABLE location_property_osmline (
+    linegeo GEOMETRY,
+    place_id BIGINT NOT NULL,
+    partition INTEGER,
+    osm_id BIGINT,
+    parent_place_id BIGINT,
+    startnumber INTEGER,
+    endnumber INTEGER,
+    interpolationtype TEXT,
+    admin_level INTEGER,
+    street TEXT,
+    postcode TEXT,
+    calculated_country_code VARCHAR(2),
+    geometry_sector INTEGER,
+    indexed_status INTEGER,
+    indexed_date TIMESTAMP);
+CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline (place_id) {ts:search-index};
+CREATE INDEX idx_osmline_parent_place_id ON location_property_osmline (parent_place_id) {ts:search-index};
+GRANT SELECT ON location_property_osmline TO "{www-user}";
+
 drop table IF EXISTS search_name;
 CREATE TABLE search_name (
   place_id BIGINT,
@@ -167,13 +162,15 @@ 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
+-- insert creates the location tables, creates location indexes if indexed == true
 CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex
     FOR EACH ROW EXECUTE PROCEDURE placex_insert();
 
 -- update insert creates the location tables
 CREATE TRIGGER placex_before_update BEFORE UPDATE ON placex
     FOR EACH ROW EXECUTE PROCEDURE placex_update();
+CREATE TRIGGER osmline_before_update BEFORE UPDATE ON location_property_osmline
+    FOR EACH ROW EXECUTE PROCEDURE osmline_update();
 
 -- diff update triggers
 CREATE TRIGGER placex_before_delete AFTER DELETE ON placex
@@ -183,9 +180,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();
 
-drop index idx_placex_sector;
-CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id) {ts:address-index};
-
 DROP SEQUENCE seq_postcodes;
 CREATE SEQUENCE seq_postcodes start 1;