Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / tables.sql

diff --git a/sql/tables.sql b/sql/tables.sql
index 19398eb558f1cb3b546011a9273a5395d1af92ea..f228081f84f1a3af19eba92051d93a095e1a6290 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -167,6 +167,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();
 -- 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
 
 -- update insert creates the location tables
 CREATE TRIGGER placex_before_update BEFORE UPDATE ON placex


@@ -182,10 +184,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();
 
 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;
 
 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,
 CREATE TABLE import_polygon_error (
   osm_type char(1),
   osm_id INTEGER,


@@ -201,7 +203,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}";
 
 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,
 CREATE TABLE import_polygon_delete (
   osm_type char(1),
   osm_id INTEGER,


@@ -211,7 +213,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}";
 
 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
 CREATE SEQUENCE file start 1;
 
 -- null table so it won't error