# HG changeset patch # User Sascha Wilde # Date 1563364441 -7200 # Node ID 2fa052a44300d012deb284c1b2341a5b15a78553 # Parent 42af5ec25a7c6f87c691e98821647d9424ab935f Set schema version in update-db.sh, not in extra scripts. Also fixed handling of empty gemma_schema_version table. diff -r 42af5ec25a7c -r 2fa052a44300 schema/update-db.sh --- 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 diff -r 42af5ec25a7c -r 2fa052a44300 schema/updates/0000/99.set_version.sql --- 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); diff -r 42af5ec25a7c -r 2fa052a44300 schema/updates/0301/99.set_version.sql --- 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); diff -r 42af5ec25a7c -r 2fa052a44300 schema/updates/1000/99.set_version.sql --- 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);