From 835c23e5f491b3b4e0e61873113e210cbd373813 Mon Sep 17 00:00:00 2001 From: Jannis Adamek Date: Tue, 16 Apr 2024 21:39:37 +0200 Subject: [PATCH] Combine two migrations into one. --- .../2024-04-01-080848_alter_drawing_fill_pattern/down.sql | 6 ------ .../2024-04-01-080848_alter_drawing_fill_pattern/up.sql | 3 --- .../2024-04-01-191448_add_image_and_text/down.sql | 6 +++--- .../migrations/2024-04-01-191448_add_image_and_text/up.sql | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/down.sql delete mode 100644 backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/up.sql diff --git a/backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/down.sql b/backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/down.sql deleted file mode 100644 index ff30fd0c5..000000000 --- a/backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/down.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE drawings ADD COLUMN fill_enabled boolean; - -UPDATE drawings SET fill_enabled = (fill_pattern != 'none'); -ALTER TABLE drawings DROP COLUMN fill_pattern; - -ALTER TABLE drawings ALTER COLUMN fill_enabled SET NOT NULL; diff --git a/backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/up.sql b/backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/up.sql deleted file mode 100644 index cf508f0c1..000000000 --- a/backend/migrations/2024-04-01-080848_alter_drawing_fill_pattern/up.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE drawings ADD COLUMN fill_pattern text NOT NULL; -UPDATE drawings SET fill_pattern = CASE WHEN fill_enabled THEN 'solid' ELSE 'none' END; -ALTER TABLE drawings DROP COLUMN fill_enabled; diff --git a/backend/migrations/2024-04-01-191448_add_image_and_text/down.sql b/backend/migrations/2024-04-01-191448_add_image_and_text/down.sql index caff3e89e..b88caaa1e 100644 --- a/backend/migrations/2024-04-01-191448_add_image_and_text/down.sql +++ b/backend/migrations/2024-04-01-191448_add_image_and_text/down.sql @@ -13,16 +13,16 @@ DROP TYPE drawing_shape_type_old; ALTER TABLE drawings ADD COLUMN color varchar, -ADD COLUMN fill_pattern varchar, +ADD COLUMN fill_enabled boolean, ADD COLUMN stroke_width real; UPDATE drawings SET color = '', - fill_pattern = false, + fill_enabled = false, stroke_width = 1.0; ALTER TABLE drawings ALTER COLUMN color SET NOT NULL; -ALTER TABLE drawings ALTER COLUMN fill_pattern SET NOT NULL; +ALTER TABLE drawings ALTER COLUMN fill_enabled SET NOT NULL; ALTER TABLE drawings ALTER COLUMN stroke_width SET NOT NULL; diff --git a/backend/migrations/2024-04-01-191448_add_image_and_text/up.sql b/backend/migrations/2024-04-01-191448_add_image_and_text/up.sql index 23229921d..e622d7c48 100644 --- a/backend/migrations/2024-04-01-191448_add_image_and_text/up.sql +++ b/backend/migrations/2024-04-01-191448_add_image_and_text/up.sql @@ -3,5 +3,5 @@ ALTER TYPE drawing_shape_type ADD VALUE 'image'; ALTER TABLE drawings DROP COLUMN color, -DROP COLUMN fill_pattern, +DROP COLUMN fill_enabled, DROP COLUMN stroke_width;