From bac33c66d91b1a4adcce4c3ebadbba1e951aa27b Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Fri, 21 Mar 2025 19:53:39 -0400 Subject: [PATCH] [F] Fix merge conflict --- .../resources/db/V1000_40__chusan_verse.sql | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/main/resources/db/V1000_40__chusan_verse.sql diff --git a/src/main/resources/db/V1000_40__chusan_verse.sql b/src/main/resources/db/V1000_40__chusan_verse.sql deleted file mode 100644 index ea17e466..00000000 --- a/src/main/resources/db/V1000_40__chusan_verse.sql +++ /dev/null @@ -1,17 +0,0 @@ -ALTER TABLE chusan_user_data ADD COLUMN trophy_id_sub1 INT NOT NULL DEFAULT 0; -ALTER TABLE chusan_user_data ADD COLUMN trophy_id_sub2 INT NOT NULL DEFAULT 0; - -CREATE TABLE chusan_user_challenge -( - id BIGINT AUTO_INCREMENT NOT NULL PRIMARY KEY, - user_id BIGINT NOT NULL, - unlock_challenge_id INT NOT NULL, - status INT NOT NULL, - clear_course_id INT NOT NULL, - condition_type INT NOT NULL, - score INT NOT NULL, - life INT NOT NULL, - clear_date VARCHAR(20) NULL, - CONSTRAINT fku_chusan_user_challenge FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT unique_user_challenge UNIQUE (user_id, unlock_challenge_id) -);