Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-10 07:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[F] Fix merge conflicts

Browse Source
This commit is contained in:
Azalea
2024-03-22 15:06:31 -04:00
parent 2a7ce54c28
commit e91029f66e
8 changed files with 15 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/db/migration/mariadb/V262__add_chusan_luminous_support.sql → src/main/resources/db/migration/mariadb/V256__add_chusan_luminous_support.sql
View File

@@ -1,15 +1,13 @@
CREATE TABLE chusan_user_cmission
(
id BIGINT AUTO_INCREMENT NOT NULL,
user_id BIGINT NULL,
user_id BIGINT NOT NULL ,
mission_id INT NULL,
point INT NULL,
CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id)
CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id),
CONSTRAINT fku_chusan_user_cmission FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE
);
ALTER TABLE chusan_user_cmission
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);
CREATE TABLE chusan_user_cmission_progress
(
id BIGINT AUTO_INCREMENT NOT NULL,
@@ -18,11 +16,7 @@ CREATE TABLE chusan_user_cmission_progress
`order` INT NOT NULL,
stage INT NULL,
progress INT NULL,
CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id)
);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT uc_6ab791e9e8fee2b3fab35d3d2 UNIQUE (user_id, mission_id, `order`);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_PROGRESS_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);
CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id),
CONSTRAINT fku_chusan_user_cmission_progress FOREIGN KEY (user_id) REFERENCES chusan_user_data (id) ON DELETE CASCADE ON UPDATE CASCADE,
CONSTRAINT unque_chusan_user_cmission_progress UNIQUE (user_id, mission_id, `order`)
);

28
src/main/resources/db/migration/mysql/V262__add_chusan_luminous_support.sql
View File

@@ -1,28 +0,0 @@
CREATE TABLE chusan_user_cmission
(
id BIGINT AUTO_INCREMENT NOT NULL,
user_id BIGINT NULL,
mission_id INT NULL,
point INT NULL,
CONSTRAINT pk_chusan_user_cmission PRIMARY KEY (id)
);
ALTER TABLE chusan_user_cmission
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);
CREATE TABLE chusan_user_cmission_progress
(
id BIGINT AUTO_INCREMENT NOT NULL,
user_id BIGINT NULL,
mission_id INT NULL,
`order` INT NOT NULL,
stage INT NULL,
progress INT NULL,
CONSTRAINT pk_chusan_user_cmission_progress PRIMARY KEY (id)
);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT uc_6ab791e9e8fee2b3fab35d3d2 UNIQUE (user_id, mission_id, `order`);
ALTER TABLE chusan_user_cmission_progress
ADD CONSTRAINT FK_CHUSAN_USER_CMISSION_PROGRESS_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id);

0
src/main/resources/db/migration/sqlite/V262__add_chusan_luminous_support.sql → src/main/resources/db/migration/sqlite/V256__add_chusan_luminous_support.sql
View File