summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql3
-rw-r--r--src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql b/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql
index bb4454ea03..43b2a92dca 100644
--- a/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql
+++ b/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql
@@ -1,8 +1,9 @@
-- Upgrade: schema_version 16 to 17 (MySQL)
--
-ALTER TABLE system_config DROP xsrf_private_key;
ALTER TABLE system_config DROP max_session_age;
+
+ALTER TABLE system_config DROP xsrf_private_key;
ALTER TABLE system_config CHANGE COLUMN account_private_key register_email_private_key VARCHAR(36) NOT NULL;
ALTER TABLE changes ADD change_key VARCHAR(60);
diff --git a/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql b/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql
index b3d5f70f2b..66f5a7ec85 100644
--- a/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql
+++ b/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql
@@ -21,12 +21,13 @@ BEGIN
END;
$$ LANGUAGE plpgsql;
+ALTER TABLE system_config DROP max_session_age;
+
BEGIN;
SELECT check_schema_version(16);
ALTER TABLE system_config DROP xsrf_private_key;
-ALTER TABLE system_config DROP max_session_age;
ALTER TABLE system_config RENAME account_private_key TO register_email_private_key;
ALTER TABLE changes ADD change_key VARCHAR(60);