From b0119f320ac6035ce5e0f2ef5bb5ff96a2c23b5e Mon Sep 17 00:00:00 2001 From: johnnyjoy Date: Sat, 1 Feb 2025 11:19:36 +0800 Subject: [PATCH] chore: tweak migration scripts --- server/version/version.go | 2 +- store/migration/mysql/0.24/00__memo.sql | 11 +---------- store/migration/mysql/0.24/01__memo_pinned.sql | 8 ++++++++ store/migration/postgres/0.24/00__memo.sql | 11 +---------- store/migration/postgres/0.24/01__memo_pinned.sql | 8 ++++++++ store/migration/sqlite/0.24/00__memo.sql | 11 +---------- store/migration/sqlite/0.24/01__memo_pinned.sql | 8 ++++++++ test/store/migrator_test.go | 2 +- 8 files changed, 29 insertions(+), 32 deletions(-) create mode 100644 store/migration/mysql/0.24/01__memo_pinned.sql create mode 100644 store/migration/postgres/0.24/01__memo_pinned.sql create mode 100644 store/migration/sqlite/0.24/01__memo_pinned.sql diff --git a/server/version/version.go b/server/version/version.go index 4022fcb1..1f7c2891 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -9,7 +9,7 @@ import ( // Version is the service current released version. // Semantic versioning: https://semver.org/ -var Version = "0.23.1" +var Version = "0.24.0" // DevVersion is the service current development version. var DevVersion = "0.24.0" diff --git a/store/migration/mysql/0.24/00__memo.sql b/store/migration/mysql/0.24/00__memo.sql index fc8a22e8..64ee71f0 100644 --- a/store/migration/mysql/0.24/00__memo.sql +++ b/store/migration/mysql/0.24/00__memo.sql @@ -1,11 +1,2 @@ -- Drop deprecated tags column. -ALTER TABLE `memo` DROP COLUMN `tags`; - --- Add pinned column. -ALTER TABLE `memo` ADD COLUMN `pinned` BOOLEAN NOT NULL DEFAULT FALSE; - --- Update pinned column from memo_organizer. -UPDATE `memo` -SET `pinned` = TRUE -FROM `memo_organizer` -WHERE `memo`.`id` = `memo_organizer`.`memo_id` AND `memo_organizer`.`pinned` = 1; \ No newline at end of file +ALTER TABLE `memo` DROP COLUMN `tags`; \ No newline at end of file diff --git a/store/migration/mysql/0.24/01__memo_pinned.sql b/store/migration/mysql/0.24/01__memo_pinned.sql new file mode 100644 index 00000000..995fa449 --- /dev/null +++ b/store/migration/mysql/0.24/01__memo_pinned.sql @@ -0,0 +1,8 @@ +-- Add pinned column. +ALTER TABLE `memo` ADD COLUMN `pinned` BOOLEAN NOT NULL DEFAULT FALSE; + +-- Update pinned column from memo_organizer. +UPDATE `memo` +SET `pinned` = TRUE +FROM `memo_organizer` +WHERE `memo`.`id` = `memo_organizer`.`memo_id` AND `memo_organizer`.`pinned` = 1; \ No newline at end of file diff --git a/store/migration/postgres/0.24/00__memo.sql b/store/migration/postgres/0.24/00__memo.sql index 506319ab..5e4ee382 100644 --- a/store/migration/postgres/0.24/00__memo.sql +++ b/store/migration/postgres/0.24/00__memo.sql @@ -1,11 +1,2 @@ -- Drop deprecated tags column. -ALTER TABLE memo DROP COLUMN tags; - --- Add pinned column. -ALTER TABLE memo ADD COLUMN pinned BOOLEAN NOT NULL DEFAULT FALSE; - --- Update pinned column from memo_organizer. -UPDATE memo -SET pinned = TRUE -FROM memo_organizer -WHERE memo.id = memo_organizer.memo_id AND memo_organizer.pinned = 1; \ No newline at end of file +ALTER TABLE memo DROP COLUMN tags; \ No newline at end of file diff --git a/store/migration/postgres/0.24/01__memo_pinned.sql b/store/migration/postgres/0.24/01__memo_pinned.sql new file mode 100644 index 00000000..66adf63c --- /dev/null +++ b/store/migration/postgres/0.24/01__memo_pinned.sql @@ -0,0 +1,8 @@ +-- Add pinned column. +ALTER TABLE memo ADD COLUMN pinned BOOLEAN NOT NULL DEFAULT FALSE; + +-- Update pinned column from memo_organizer. +UPDATE memo +SET pinned = TRUE +FROM memo_organizer +WHERE memo.id = memo_organizer.memo_id AND memo_organizer.pinned = 1; \ No newline at end of file diff --git a/store/migration/sqlite/0.24/00__memo.sql b/store/migration/sqlite/0.24/00__memo.sql index ca8e0638..45854e15 100644 --- a/store/migration/sqlite/0.24/00__memo.sql +++ b/store/migration/sqlite/0.24/00__memo.sql @@ -4,13 +4,4 @@ ALTER TABLE memo DROP COLUMN tags; -- Remove deprecated indexes. DROP INDEX IF EXISTS idx_memo_tags; DROP INDEX IF EXISTS idx_memo_content; -DROP INDEX IF EXISTS idx_memo_visibility; - --- Add pinned column. -ALTER TABLE memo ADD COLUMN pinned INTEGER NOT NULL CHECK (pinned IN (0, 1)) DEFAULT 0; - --- Update pinned column from memo_organizer. -UPDATE memo -SET pinned = 1 -FROM memo_organizer -WHERE memo.id = memo_organizer.memo_id AND memo_organizer.pinned = 1; \ No newline at end of file +DROP INDEX IF EXISTS idx_memo_visibility; \ No newline at end of file diff --git a/store/migration/sqlite/0.24/01__memo_pinned.sql b/store/migration/sqlite/0.24/01__memo_pinned.sql new file mode 100644 index 00000000..48f23b60 --- /dev/null +++ b/store/migration/sqlite/0.24/01__memo_pinned.sql @@ -0,0 +1,8 @@ +-- Add pinned column. +ALTER TABLE memo ADD COLUMN pinned INTEGER NOT NULL CHECK (pinned IN (0, 1)) DEFAULT 0; + +-- Update pinned column from memo_organizer. +UPDATE memo +SET pinned = 1 +FROM memo_organizer +WHERE memo.id = memo_organizer.memo_id AND memo_organizer.pinned = 1; \ No newline at end of file diff --git a/test/store/migrator_test.go b/test/store/migrator_test.go index f2488882..36b94d86 100644 --- a/test/store/migrator_test.go +++ b/test/store/migrator_test.go @@ -13,5 +13,5 @@ func TestGetCurrentSchemaVersion(t *testing.T) { currentSchemaVersion, err := ts.GetCurrentSchemaVersion() require.NoError(t, err) - require.Equal(t, "0.23.1", currentSchemaVersion) + require.Equal(t, "0.24.2", currentSchemaVersion) }