Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / admin / Migration.md

diff --git a/docs/admin/Migration.md b/docs/admin/Migration.md
index e18b3df54dbe8d1fef9b72347439cdd9c7d92e7a..94f403ecfcb2c030460e6a1720ba3e586fc22820 100644 (file)
--- a/docs/admin/Migration.md
+++ b/docs/admin/Migration.md
@@ -4,7 +4,31 @@ This page describes database migrations necessary to update existing databases
 to newer versions of Nominatim.
 
 SQL statements should be executed from the postgres commandline. Execute
 to newer versions of Nominatim.
 
 SQL statements should be executed from the postgres commandline. Execute

-`psql nominiatim` to enter command line mode.
+`psql nominatim` to enter command line mode.
+
+
+## 3.2.0 -> master
+
+### Natural Earth country boundaries no longer needed as fallback
+
+```
+DROP TABLE country_naturalearthdata;
+```
+
+Finally, update all SQL functions:
+
+```sh
+./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
+```
+
+### Configurable Address Levels
+
+The new configurable address levels require a new table. Create it with the
+following command:
+
+```sh
+./utils/update.php --update-address-levels
+```

 
 ## 3.1.0 -> 3.2.0
 
 
 ## 3.1.0 -> 3.2.0
 


@@ -15,17 +39,17 @@ SQL statements to create the indexes:
 
 ```
 CREATE INDEX idx_placex_geometry_reverse_lookupPoint
 
 ```
 CREATE INDEX idx_placex_geometry_reverse_lookupPoint

-  ON placex USING gist (geometry) {ts:search-index}
+  ON placex USING gist (geometry)

   WHERE (name is not null or housenumber is not null or rank_address between 26 and 27)
     AND class not in ('railway','tunnel','bridge','man_made')
     AND rank_address >= 26 AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_lookupPolygon
   WHERE (name is not null or housenumber is not null or rank_address between 26 and 27)
     AND class not in ('railway','tunnel','bridge','man_made')
     AND rank_address >= 26 AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_lookupPolygon

-  ON placex USING gist (geometry) {ts:search-index}
+  ON placex USING gist (geometry)

   WHERE St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon')
     AND rank_address between 4 and 25 AND type != 'postcode'
     AND name is not null AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_placeNode
   WHERE St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon')
     AND rank_address between 4 and 25 AND type != 'postcode'
     AND name is not null AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_placeNode

-  ON placex USING gist (geometry) {ts:search-index}
+  ON placex USING gist (geometry)

   WHERE osm_type = 'N' AND rank_search between 5 and 25
     AND class = 'place' AND type != 'postcode'
     AND name is not null AND indexed_status = 0 AND linked_place_id is null;
   WHERE osm_type = 'N' AND rank_search between 5 and 25
     AND class = 'place' AND type != 'postcode'
     AND name is not null AND indexed_status = 0 AND linked_place_id is null;


@@ -39,12 +63,18 @@ GRANT SELECT ON table country_osm_grid to "www-user";
 
 Replace the `www-user` with the user name of your website server if necessary.
 
 
 Replace the `www-user` with the user name of your website server if necessary.
 

-Finally, you can drop the now unused indexes:
+You can now drop the unused indexes:

 
 ```
 DROP INDEX idx_placex_reverse_geometry;
 ```
 
 
 ```
 DROP INDEX idx_placex_reverse_geometry;
 ```
 

+Finally, update all SQL functions:
+
+```sh
+./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
+```
+

 ## 3.0.0 -> 3.1.0
 
 ### Postcode Table
 ## 3.0.0 -> 3.1.0
 
 ### Postcode Table