# HG changeset patch
# User Thomas Junk <thomas.junk@intevation.de>
# Date 1563365631 -7200
# Node ID beaa75082c09f9c3f082c20587784a5f911002eb
# Parent  5c520da2712236dec0f21890fed362d64900d141# Parent  2fa052a44300d012deb284c1b2341a5b15a78553
merge

diff -r 5c520da27122 -r beaa75082c09 schema/install-db.sh
--- 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" \
diff -r 5c520da27122 -r beaa75082c09 schema/update-db.sh
--- 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
diff -r 5c520da27122 -r beaa75082c09 schema/updates/0000/99.set_version.sql
--- 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);
diff -r 5c520da27122 -r beaa75082c09 schema/updates/0301/99.set_version.sql
--- 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);
diff -r 5c520da27122 -r beaa75082c09 schema/updates/1000/99.set_version.sql
--- a/schema/updates/1000/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 (1000);
diff -r 5c520da27122 -r beaa75082c09 schema/version.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/version.sql	Wed Jul 17 14:13:51 2019 +0200
@@ -0,0 +1,1 @@
+INSERT INTO gemma_schema_version(version) VALUES (1000);