diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2260081248f96f2e6c43e7ab8252fe9d2a57f7..2b4657aadbe41588bf24f38aba024678bc1f3e55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Upcoming version: ----------------- + - fixing problem where mineT functionswere not added to DB (Nikolaus Krismer) - deactivating data update on every provision (Nikolaus Krismer) - added lock/done files. removing deprecated geoserver part (only leaving functionality that is used by isochrone-web project) (Nikolaus Krismer) - changing SRID to 4326 (tests showed that especially for MineR(X) this is much faster) (Nikolaus Krismer) diff --git a/bootstrap/createDatabase.sh b/bootstrap/createDatabase.sh index 2dcecd5667f1c001ea02e7efad5763e10912fffd..3fab93ff509063c294359acc0bc937acdfed110f 100755 --- a/bootstrap/createDatabase.sh +++ b/bootstrap/createDatabase.sh @@ -51,13 +51,16 @@ if $AVAILABLE_POSTGRES; then sudo -u "postgres" ${EXEC_PSQL} -d "$PG_DB_NAME" -c "ALTER SCHEMA public OWNER TO \"$PG_DB_USER\";" >> $WORKING_DIR/setup_database.log 2>&1 sudo -u "postgres" ${EXEC_PSQL} -d "$PG_DB_NAME" -c "ALTER ROLE \"$PG_DB_USER\" SUPERUSER;" >> $WORKING_DIR/setup_database.log 2>&1 + fn_echo "Adding database functions/procedures" PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_PSQL} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -f $SHARED_CONF_DIR/pg_procedures.sql >> $WORKING_DIR/setup_database.log 2>&1 -PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_PSQL} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -f $SHARED_CONF_DIR/pg_procedures_minet.sql >> $WORKING_DIR/setup_database.log 2>&1 if $AVAILABLE_POSTGIS; then fn_echo "Registering postgis extension for database \"$PG_DB_NAME\"" PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_PSQL} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -c "CREATE EXTENSION postgis;" >> $WORKING_DIR/setup_database.log 2>&1 PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_PSQL} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -f $SHARED_CONF_DIR/srid_82344_insert.sql >> $WORKING_DIR/setup_database.log 2>&1 + + fn_echo "Adding postgis functions/procedures" + PGPASSWORD="$PG_DB_PASSWORD" ${EXEC_PSQL} -U "$PG_DB_USER" -h localhost -d "$PG_DB_NAME" -f $SHARED_CONF_DIR/pg_procedures_minet.sql >> $WORKING_DIR/setup_database.log 2>&1 fi if $AVAILABLE_ISOCHRONE_DATAMODEL; then diff --git a/conf/pg_procedures_minet.sql b/conf/pg_procedures_postgis.sql similarity index 100% rename from conf/pg_procedures_minet.sql rename to conf/pg_procedures_postgis.sql