X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8b91284f7fe4dd2280484e25673634b78fb9c7c0..c8e79397f5b71eae8fd7738c931f7f80b1228654:/sql/tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index 19398eb5..c28229fa 100644
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -94,10 +94,11 @@ CREATE TABLE location_property_osmline (
     startnumber INTEGER,
     endnumber INTEGER,
     interpolationtype TEXT,
+    address HSTORE,
     street TEXT,
     addr_place TEXT,
     postcode TEXT,
-    calculated_country_code VARCHAR(2),
+    country_code VARCHAR(2),
     geometry_sector INTEGER,
     indexed_status INTEGER,
     indexed_date TIMESTAMP){ts:search-data};
@@ -144,7 +145,11 @@ CREATE TABLE placex (
   indexed_date TIMESTAMP,
   wikipedia TEXT, -- calculated wikipedia article name (language:title)
   geometry_sector INTEGER,
-  calculated_country_code varchar(2)
+  country_code varchar(2),
+  street TEXT,
+  addr_place TEXT,
+  housenumber TEXT,
+  postcode TEXT
   ) {ts:search-data};
 SELECT AddGeometryColumn('placex', 'centroid', 4326, 'GEOMETRY', 2);
 CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {ts:search-index};
@@ -167,6 +172,8 @@ GRANT SELECT on location_area to "{www-user}" ;
 -- 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();
+CREATE TRIGGER osmline_before_insert BEFORE INSERT ON location_property_osmline
+    FOR EACH ROW EXECUTE PROCEDURE osmline_insert();
 
 -- update insert creates the location tables
 CREATE TRIGGER placex_before_update BEFORE UPDATE ON placex
@@ -182,10 +189,10 @@ 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 SEQUENCE seq_postcodes;
+DROP SEQUENCE IF EXISTS seq_postcodes;
 CREATE SEQUENCE seq_postcodes start 1;
 
-drop table import_polygon_error;
+DROP TABLE IF EXISTS import_polygon_error;
 CREATE TABLE import_polygon_error (
   osm_type char(1),
   osm_id INTEGER,
@@ -201,7 +208,7 @@ SELECT AddGeometryColumn('import_polygon_error', 'newgeometry', 4326, 'GEOMETRY'
 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;
+DROP TABLE IF EXISTS import_polygon_delete;
 CREATE TABLE import_polygon_delete (
   osm_type char(1),
   osm_id INTEGER,
@@ -211,7 +218,7 @@ CREATE TABLE import_polygon_delete (
 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;
+DROP SEQUENCE IF EXISTS file;
 CREATE SEQUENCE file start 1;
 
 -- null table so it won't error