Merge branch 'master' of http://github.com/twain47/Nominatim

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index 6908e7edd96e201fb35a99606aebe9ef0e29adf4..a0ad66a8353d814754d5cd6e576c976865f8b7c1 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -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,6 +30,7 @@ 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,
   endtime timestamp,
   results integer,
   format text,


@@ -52,9 +41,6 @@ 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" ;
 
 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;
-

 --drop table IF EXISTS report_log;
 CREATE TABLE report_log (
   starttime timestamp,
 --drop table IF EXISTS report_log;
 CREATE TABLE report_log (
   starttime timestamp,


@@ -190,18 +176,7 @@ drop table 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 INTEGER,
-  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,


@@ -209,13 +184,17 @@ CREATE TABLE placex (
   importance FLOAT,
   indexed_status INTEGER,
   indexed_date TIMESTAMP,
   importance FLOAT,
   indexed_status INTEGER,
   indexed_date TIMESTAMP,

-  geometry_sector INTEGER
+  wikipedia TEXT, -- calculated wikipedia article name (language:title)
+  geometry_sector INTEGER,
+  calculated_country_code varchar(2)

   ) TABLESPACE ssd;
   ) TABLESPACE ssd;

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

 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) TABLESPACE ssd;
 CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) TABLESPACE ssd;
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) TABLESPACE ssd;
 CREATE INDEX idx_placex_osmid ON placex USING BTREE (osm_type, osm_id) TABLESPACE ssd;

+CREATE INDEX idx_placex_linked_place_id ON placex USING BTREE (linked_place_id) TABLESPACE ssd;

 CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) TABLESPACE ssd;
 CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) TABLESPACE ssd;
 CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search, geometry_sector) TABLESPACE ssd;
 CREATE INDEX idx_placex_geometry ON placex USING GIST (geometry) TABLESPACE ssd;

+CREATE INDEX idx_placex_adminname on placex USING BTREE (make_standard_name(name->'name'),rank_search) TABLESPACE ssd WHERE osm_type='N' and rank_search < 26;

 
 --CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed);
 
 
 --CREATE INDEX idx_placex_indexed ON placex USING BTREE (indexed);
 


@@ -297,3 +276,28 @@ CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTRE
 
 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);
+