X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/31273a42bd925fa6baad86504c760c93e051106c..cc564e2f319bb267884998c7243d179320aa0327:/sql/tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index b8c63f71..78de9e8c 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -13,6 +13,16 @@ CREATE TABLE import_osmosis_log (
   event text
   );
 
+drop table 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,
@@ -23,6 +33,7 @@ CREATE TABLE query_log (
   );
 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,
@@ -77,7 +88,7 @@ CREATE SEQUENCE seq_word start 1;
 drop table IF EXISTS location_area CASCADE;
 CREATE TABLE location_area (
   partition integer,
-  place_id INTEGER,
+  place_id BIGINT,
   country_code VARCHAR(2), 
   keywords INTEGER[],
   rank_search INTEGER NOT NULL,
@@ -93,9 +104,9 @@ CREATE TABLE location_area_roadfar () INHERITS (location_area);
 
 drop table IF EXISTS location_property CASCADE;
 CREATE TABLE location_property (
-  place_id INTEGER,
+  place_id BIGINT,
   partition integer,
-  parent_place_id INTEGER,
+  parent_place_id BIGINT,
   housenumber TEXT,
   postcode TEXT
   );
@@ -105,15 +116,17 @@ 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);
+GRANT SELECT ON location_property_aux TO "www-data";
 
 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";
 
 drop table IF EXISTS search_name_blank CASCADE;
 CREATE TABLE search_name_blank (
-  place_id INTEGER,
+  place_id BIGINT,
   search_rank integer,
   address_rank integer,
   importance FLOAT,
@@ -125,15 +138,15 @@ 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 search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops) WITH (fastupdate = off);
-CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops) WITH (fastupdate = off);
+CREATE INDEX search_name_name_vector_idx ON search_name USING GIN (name_vector) WITH (fastupdate = off);
+CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector) WITH (fastupdate = off);
 CREATE INDEX idx_search_name_centroid ON search_name USING GIST (centroid);
 CREATE INDEX idx_search_name_place_id ON search_name USING BTREE (place_id);
 
 drop table IF EXISTS place_addressline;
 CREATE TABLE place_addressline (
-  place_id INTEGER,
-  address_place_id INTEGER,
+  place_id BIGINT,
+  address_place_id BIGINT,
   fromarea boolean,
   isaddress boolean,
   distance float,
@@ -144,7 +157,7 @@ CREATE INDEX idx_place_addressline_address_place_id on place_addressline USING B
 
 drop table IF EXISTS place_boundingbox CASCADE;
 CREATE TABLE place_boundingbox (
-  place_id INTEGER,
+  place_id BIGINT,
   minlat float,
   maxlat float,
   minlon float,
@@ -162,7 +175,7 @@ drop table IF EXISTS reverse_cache;
 CREATE TABLE reverse_cache (
   latlonzoomid integer,
   country_code varchar(2),
-  place_id INTEGER
+  place_id BIGINT
   );
 GRANT SELECT on reverse_cache to "www-data" ;
 GRANT INSERT on reverse_cache to "www-data" ;
@@ -182,7 +195,7 @@ CREATE INDEX idx_country_geometry ON country USING GIST (geometry);
 
 drop table placex;
 CREATE TABLE placex (
-  place_id INTEGER NOT NULL,
+  place_id BIGINT NOT NULL,
   partition integer,
   osm_type char(1),
   osm_id INTEGER,
@@ -196,8 +209,8 @@ CREATE TABLE placex (
   postcode TEXT,
   country_code varchar(2),
   extratags HSTORE,
-  parent_place_id INTEGER,
-  linked_place_id INTEGER,
+  parent_place_id BIGINT,
+  linked_place_id BIGINT,
   rank_address INTEGER,
   rank_search INTEGER,
   importance FLOAT,
@@ -274,3 +287,30 @@ CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_addre
 
 DROP SEQUENCE seq_postcodes;
 CREATE SEQUENCE seq_postcodes start 1;
+
+drop table import_polygon_error;
+CREATE TABLE import_polygon_error (
+  osm_type char(1),
+  osm_id INTEGER,
+  class TEXT NOT NULL,
+  type TEXT NOT NULL,
+  name HSTORE,
+  country_code varchar(2),
+  updated timestamp,
+  errormessage text
+  );
+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);
+
+drop table import_polygon_delete;
+CREATE TABLE import_polygon_delete (
+  osm_type char(1),
+  osm_id INTEGER,
+  class TEXT NOT NULL,
+  type TEXT NOT NULL
+  );
+CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id);
+
+drop sequence file;
+CREATE SEQUENCE file start 1;