Mercurial > gemma
changeset 3988:beaa75082c09
merge
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Wed, 17 Jul 2019 14:13:51 +0200 |
| parents | 5c520da27122 (current diff) 2fa052a44300 (diff) |
| children | ca448aff3a17 06096a7ce1c5 |
| files | schema/updates/0000/99.set_version.sql schema/updates/0301/99.set_version.sql schema/updates/1000/99.set_version.sql |
| diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/schema/install-db.sh Wed Jul 17 14:13:34 2019 +0200 +++ b/schema/install-db.sh Wed Jul 17 14:13:51 2019 +0200 @@ -133,8 +133,8 @@ -f "$BASEDIR/geoserver_views.sql" \ -f "$BASEDIR/auth.sql" \ -f "$BASEDIR/isrs_functions.sql" \ - -f "$BASEDIR/default_sysconfig.sql" - + -f "$BASEDIR/default_sysconfig.sql" \ + -f "$BASEDIR/version.sql" # setup initial login roles with given passwords: psql -qt -P pager=off -p "$port" -d "$db" \
--- a/schema/update-db.sh Wed Jul 17 14:13:34 2019 +0200 +++ b/schema/update-db.sh Wed Jul 17 14:13:51 2019 +0200 @@ -88,7 +88,7 @@ if ver=$( psql -qtA -p "$port" -d "$db" \ -c 'SELECT get_schema_version()' 2>/dev/null ) then - echo $ver + echo ${ver:--1} else echo '-1' fi @@ -104,6 +104,8 @@ echo "Running updates for $new_ver ..." sql=$( cat `echo "$d/"* | sort -n` ) + sql+="INSERT INTO gemma_schema_version(version) VALUES ($new_ver);" + psql -1 -q -p "$port" -d "$db" -c "$sql" fi done
--- a/schema/updates/0000/99.set_version.sql Wed Jul 17 14:13:34 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -INSERT INTO gemma_schema_version(version) VALUES (0);
--- a/schema/updates/0301/99.set_version.sql Wed Jul 17 14:13:34 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -INSERT INTO gemma_schema_version(version) VALUES (301);