From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Jan 2015 14:40:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~492
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/d6fa3ce8ff49fe56f24d10975e83c8b4b65e5f79

Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/tiger_import_finish.sql
---

d6fa3ce8ff49fe56f24d10975e83c8b4b65e5f79
diff --cc sql/tiger_import_finish.sql
index d6ec1833,4718d502..a7d837f4
--- a/sql/tiger_import_finish.sql
+++ b/sql/tiger_import_finish.sql
@@@ -1,12 -1,12 +1,12 @@@
- CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber);
- CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id);
+ CREATE INDEX idx_location_property_tiger_housenumber_parent_place_id_imp ON location_property_tiger_import (parent_place_id, housenumber) {ts:aux-index};
+ CREATE UNIQUE INDEX idx_location_property_tiger_place_id_imp ON location_property_tiger_import (place_id) {ts:aux-index};
  
- GRANT SELECT ON location_property_tiger_import TO "www-data";
+ GRANT SELECT ON location_property_tiger_import TO "{www-user}";
  
- --DROP TABLE location_property_tiger;
 -DROP TABLE IF EXISTS location_property_tiger;
 -ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
++--DROP TABLE IF EXISTS location_property_tiger;
 +--ALTER TABLE location_property_tiger_import RENAME TO location_property_tiger;
  
 -ALTER INDEX idx_location_property_tiger_housenumber_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
 -ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id;
 +--ALTER INDEX idx_location_property_tiger_housenumber_parent_place_id_imp RENAME TO idx_location_property_tiger_housenumber_parent_place_id;
 +--ALTER INDEX idx_location_property_tiger_place_id_imp RENAME TO idx_location_property_tiger_place_id;
  
  DROP FUNCTION tigger_create_interpolation (linegeo geometry, in_startnumber integer, in_endnumber integer, interpolationtype text, in_street text, in_isin text, in_postcode text);