Merge remote-tracking branch 'upstream/pull/3194'

[rails.git] / docker / postgres / openstreetmap-postgres-init.sh

diff --git a/docker/postgres/openstreetmap-postgres-init.sh b/docker/postgres/openstreetmap-postgres-init.sh
index d8c619d45fd90b0af0da764ab9d77e6bf43be536..1a7c58857c9553b17ee76832a8d82b67ebe93bee 100755 (executable)
--- a/docker/postgres/openstreetmap-postgres-init.sh
+++ b/docker/postgres/openstreetmap-postgres-init.sh
@@ -2,10 +2,14 @@
 set -ex
 
 # Create 'openstreetmap' user
 set -ex
 
 # Create 'openstreetmap' user

+# Password and superuser privilege are needed to successfully run test suite

 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" <<-EOSQL
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" <<-EOSQL

-    CREATE USER openstreetmap PASSWORD 'openstreetmap';
+    CREATE USER openstreetmap SUPERUSER PASSWORD 'openstreetmap';

     GRANT ALL PRIVILEGES ON DATABASE openstreetmap TO openstreetmap;
 EOSQL
 
 # Create btree_gist extensions
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -c "CREATE EXTENSION btree_gist" openstreetmap
     GRANT ALL PRIVILEGES ON DATABASE openstreetmap TO openstreetmap;
 EOSQL
 
 # Create btree_gist extensions
 psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -c "CREATE EXTENSION btree_gist" openstreetmap

+
+# Define custom functions
+psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -f "/usr/local/share/osm-db-functions.sql" openstreetmap