change partition from char to int, partition search_name on country

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index 62a4eb36a1398a249809ba1234c3207e8a2b2955..87e58d68056c97c6d5e6e75628ed8e4f77d01b8e 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -76,7 +76,7 @@ CREATE SEQUENCE seq_word start 1;
 
 drop table IF EXISTS location_area CASCADE;
 CREATE TABLE location_area (
-  partition varchar(10),
+  partition integer,
   place_id INTEGER,
   country_code VARCHAR(2), 
   keywords INTEGER[],
@@ -91,18 +91,22 @@ 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 search_name;
-CREATE TABLE search_name (
+drop table IF EXISTS search_name_blank CASCADE;
+CREATE TABLE search_name_blank (
   place_id INTEGER,
   search_rank integer,
   address_rank integer,
+  importance FLOAT,
   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 search_name_name_vector_idx ON search_name USING GIN (name_vector gin__int_ops);
 CREATE INDEX searchnameplacesearch_search_nameaddress_vector_idx ON search_name USING GIN (nameaddress_vector gin__int_ops);
-SELECT AddGeometryColumn('search_name', 'centroid', 4326, 'GEOMETRY', 2);
 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);
 
@@ -159,7 +163,7 @@ CREATE INDEX idx_country_geometry ON country USING GIST (geometry);
 drop table placex;
 CREATE TABLE placex (
   place_id INTEGER NOT NULL,
-  partition varchar(10),
+  partition integer,
   osm_type char(1),
   osm_id INTEGER,
   class TEXT NOT NULL,
@@ -172,7 +176,8 @@ CREATE TABLE placex (
   postcode TEXT,
   country_code varchar(2),
   extratags HSTORE,
-  street_place_id INTEGER,
+  parent_place_id INTEGER,
+  linked_place_id INTEGER,
   rank_address INTEGER,
   rank_search INTEGER,
   indexed_status INTEGER,
@@ -193,7 +198,7 @@ CREATE INDEX idx_placex_pendingsector ON placex USING BTREE (rank_search,geometr
 
 --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_street_place_id ON placex USING BTREE (street_place_id) where street_place_id IS NOT NULL;
+CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) where parent_place_id IS NOT NULL;
 CREATE INDEX idx_placex_interpolation ON placex USING BTREE (geometry_sector) where indexed_status > 0 and class='place' and type='houses';
 
 CREATE INDEX idx_placex_sector ON placex USING BTREE (geometry_sector,rank_address,osm_type,osm_id);