From 0c3c59df4e3093b98e814cb68fd051d7313d6156 Mon Sep 17 00:00:00 2001 From: Nelson Chan Date: Tue, 3 Aug 2021 17:42:57 +0800 Subject: [PATCH 1/3] Fix: [DB] Add default for created_date in monitor --- db/patch5.sql | 66 ++++++++++++++++++++++++++++++++++++++++++++++ server/database.js | 2 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 db/patch5.sql diff --git a/db/patch5.sql b/db/patch5.sql new file mode 100644 index 000000000..f67af8b63 --- /dev/null +++ b/db/patch5.sql @@ -0,0 +1,66 @@ +-- You should not modify if this have pushed to Github, unless it does serious wrong with the db. +PRAGMA foreign_keys = off; + +BEGIN TRANSACTION; + +create table monitor_dg_tmp ( + id INTEGER not null primary key autoincrement, + name VARCHAR(150), + active BOOLEAN default 1 not null, + user_id INTEGER references user on update cascade on delete + set + null, + interval INTEGER default 20 not null, + url TEXT, + type VARCHAR(20), + weight INTEGER default 2000, + hostname VARCHAR(255), + port INTEGER, + created_date DATETIME default (DATETIME('now')) not null, + keyword VARCHAR(255), + maxretries INTEGER NOT NULL DEFAULT 0, + ignore_tls BOOLEAN default 0 not null, + upside_down BOOLEAN default 0 not null +); + +insert into + monitor_dg_tmp( + id, + name, + active, + user_id, + interval, + url, + type, + weight, + hostname, + port, + keyword, + maxretries + ) +select + id, + name, + active, + user_id, + interval, + url, + type, + weight, + hostname, + port, + keyword, + maxretries +from + monitor; + +drop table monitor; + +alter table + monitor_dg_tmp rename to monitor; + +create index user_id on monitor (user_id); + +COMMIT; + +PRAGMA foreign_keys = on; \ No newline at end of file diff --git a/server/database.js b/server/database.js index 571313bc4..4accbc32e 100644 --- a/server/database.js +++ b/server/database.js @@ -9,7 +9,7 @@ class Database { static templatePath = "./db/kuma.db" static path = "./data/kuma.db"; - static latestVersion = 4; + static latestVersion = 5; static noReject = true; static async patch() { From 377d475e05e6fc5374634d6e18ff957adf59b296 Mon Sep 17 00:00:00 2001 From: Nelson Chan Date: Tue, 3 Aug 2021 17:43:39 +0800 Subject: [PATCH 2/3] Fix: Add now columns --- db/patch5.sql | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/db/patch5.sql b/db/patch5.sql index f67af8b63..16e1c282e 100644 --- a/db/patch5.sql +++ b/db/patch5.sql @@ -36,7 +36,9 @@ insert into hostname, port, keyword, - maxretries + maxretries, + ignore_tls, + upside_down ) select id, @@ -50,7 +52,9 @@ select hostname, port, keyword, - maxretries + maxretries, + ignore_tls, + upside_down from monitor; From 221aad55de4f7350221032f7c21854eca35b1981 Mon Sep 17 00:00:00 2001 From: Nelson Chan Date: Tue, 3 Aug 2021 17:46:09 +0800 Subject: [PATCH 3/3] Chore: Add new line at EOF --- db/patch5.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/patch5.sql b/db/patch5.sql index 16e1c282e..5730b2dde 100644 --- a/db/patch5.sql +++ b/db/patch5.sql @@ -67,4 +67,4 @@ create index user_id on monitor (user_id); COMMIT; -PRAGMA foreign_keys = on; \ No newline at end of file +PRAGMA foreign_keys = on;