Merge pull request #1443 from pnorman/quieter_migrations

Make migrations quieter.

Author: zerebubuth

data/migrations/run_migrations.sh

@@ -2,6 +2,7 @@
 
 migration_dir=${0%/*}
 
+PSQLOPTS="-Xq"
 # first, run any "pre-function" migrations. these might be necessary if the
 # migration alters tables to add columns referenced in the functions, in
 # which case the function creation would fail.
@@ -12,24 +13,24 @@ for sql in ${migration_dir}/*.sql; do
     [ -f $sql ] || break
 
     if [[ $sql = *prefunction*.sql ]]; then
-        psql -f "$sql" $*
+        psql $PSQLOPTS -f "$sql" $*
     else
         echo "SKIPPING $sql - this will be run after the functions."
     fi
 done
 
 # next run functions and triggers, bailing if either of these fail, as they
 # are required by later steps.
-psql --set ON_ERROR_STOP=1 -f "${migration_dir}/../functions.sql" $*
+psql $PSQLOPTS --set ON_ERROR_STOP=1 -f "${migration_dir}/../functions.sql" $*
 if [ $? -ne 0 ]; then echo "Installing new functions failed.">&2; exit 1; fi
-python ${migration_dir}/../../vectordatasource/meta/sql.py | psql --set ON_ERROR_STOP=1 $*
+python ${migration_dir}/../../vectordatasource/meta/sql.py | psql $PSQLOPTS --set ON_ERROR_STOP=1 $*
 if [ $? -ne 0 ]; then echo "Installing generated functions failed.">&2; exit 1; fi
-psql --set ON_ERROR_STOP=1 -f "${migration_dir}/../triggers.sql" $*
+psql $PSQLOPTS --set ON_ERROR_STOP=1 -f "${migration_dir}/../triggers.sql" $*
 if [ $? -ne 0 ]; then echo "Installing new triggers failed.">&2; exit 1; fi
 
 # then disable triggers
 for table in planet_osm_point planet_osm_line planet_osm_polygon planet_osm_rels; do
-    psql -c "ALTER TABLE ${table} DISABLE TRIGGER USER" $*
+    psql $PSQLOPTS -c "ALTER TABLE ${table} DISABLE TRIGGER USER" $*
 done
 
 # run updates in parallel. note that we don't bail here, as we want to
@@ -45,25 +46,25 @@ for sql in ${migration_dir}/*.sql; do
     elif [[ $sql = *prefunction*.sql ]]; then
         echo "SKIPPING $sql - this was already run before the functions."
     else
-        psql -f "$sql" $* &
+        psql $PSQLOPTS -f "$sql" $* &
     fi
 done
 
 wait
 
 # re-enable triggers
 for table in planet_osm_point planet_osm_line planet_osm_polygon planet_osm_rels; do
-    psql -c "ALTER TABLE ${table} ENABLE TRIGGER USER" $*
+    psql $PSQLOPTS -c "ALTER TABLE ${table} ENABLE TRIGGER USER" $*
 done
 
 # re-generate the functions to avoid issues when a migration updates
 # the schema
-python ${migration_dir}/../../vectordatasource/meta/sql.py | psql --set ON_ERROR_STOP=1 $*
+python ${migration_dir}/../../vectordatasource/meta/sql.py | psql $PSQLOPTS --set ON_ERROR_STOP=1 $*
 if [ $? -ne 0 ]; then echo "Installing generated functions second time failed.">&2; exit 1; fi
 
 # analyze tables in case index updates influenced query plans
 for table in planet_osm_point planet_osm_line planet_osm_polygon; do
-    psql -c "ANALYZE ${table}" $* &
+    psql $PSQLOPTS -c "ANALYZE ${table}" $* &
 done
 wait
 

data/migrations/v1.5.0-planet_osm_line.sql

@@ -1,5 +1,6 @@
 -- only these 2 columns are relevant in lower zoom queries
-CREATE INDEX
+SET client_min_messages TO WARNING;
+CREATE INDEX IF NOT EXISTS
   planet_osm_line_geom_min_zoom_8_index
   ON planet_osm_line USING gist(way)
   WHERE
@@ -70,3 +71,4 @@ DROP INDEX IF EXISTS planet_osm_line_boundary_geom_index;
 DROP INDEX IF EXISTS planet_osm_line_boundary_geom_9_index;
 DROP INDEX IF EXISTS planet_osm_line_boundary_geom_12_index;
 DROP INDEX IF EXISTS planet_osm_line_boundary_geom_15_index;
+RESET client_min_messages;

data/migrations/v1.5.0-planet_osm_point.sql

@@ -1,4 +1,5 @@
 -- ladder the point indexes
+SET client_min_messages TO WARNING;
 CREATE INDEX IF NOT EXISTS
   planet_osm_point_geom_min_zoom_6_index
   ON planet_osm_point USING gist(way)
@@ -68,3 +69,4 @@ DROP INDEX IF EXISTS planet_osm_point_min_zoom_places_index;
 DROP INDEX IF EXISTS planet_osm_point_min_zoom_places_9_index;
 DROP INDEX IF EXISTS planet_osm_point_min_zoom_places_12_index;
 DROP INDEX IF EXISTS planet_osm_point_min_zoom_places_15_index;
+RESET client_min_messages;

data/migrations/v1.5.0-planet_osm_polygon.sql

@@ -1,4 +1,5 @@
 -- polygon low zoom
+SET client_min_messages TO WARNING;
 CREATE INDEX IF NOT EXISTS
   planet_osm_polygon_geom_min_zoom_7_index
   ON planet_osm_polygon USING gist(way)
@@ -97,3 +98,4 @@ DROP INDEX IF EXISTS planet_osm_polygon_pois_geom_6_index;
 DROP INDEX IF EXISTS planet_osm_polygon_pois_geom_9_index;
 DROP INDEX IF EXISTS planet_osm_polygon_pois_geom_12_index;
 DROP INDEX IF EXISTS planet_osm_polygon_pois_geom_15_index;
+RESET client_min_messages;