Mercurial > gemma

changeset 3984:2fa052a44300

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set schema version in update-db.sh, not in extra scripts. Also fixed handling of empty gemma_schema_version table.
author Sascha Wilde <wilde@intevation.de>
date Wed, 17 Jul 2019 13:54:01 +0200
parents 42af5ec25a7c
children beaa75082c09
files schema/update-db.sh schema/updates/0000/99.set_version.sql schema/updates/0301/99.set_version.sql schema/updates/1000/99.set_version.sql
diffstat 4 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/schema/update-db.sh	Wed Jul 17 13:40:38 2019 +0200
+++ b/schema/update-db.sh	Wed Jul 17 13:54:01 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 13:40:38 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 13:40:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-INSERT INTO gemma_schema_version(version) VALUES (301);
--- a/schema/updates/1000/99.set_version.sql	Wed Jul 17 13:40:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-INSERT INTO gemma_schema_version(version) VALUES (1000);