Merge remote-tracking branch 'origin/main' into feature/diva

# Conflicts:
#	server/channelserver/handlers_diva.go

patch-schema/01-wiiu-key.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE public.users ADD COLUMN IF NOT EXISTS wiiu_key TEXT;
+
+END;

patch-schema/02-tower.sql

@@ -0,0 +1,29 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS tower (
+    char_id INT,
+    tr INT,
+    trp INT,
+    tsp INT,
+    block1 INT,
+    block2 INT,
+    skills TEXT DEFAULT '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0',
+    gems TEXT DEFAULT '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0'
+);
+
+ALTER TABLE IF EXISTS guild_characters
+    ADD COLUMN IF NOT EXISTS tower_mission_1 INT;
+
+ALTER TABLE IF EXISTS guild_characters
+    ADD COLUMN IF NOT EXISTS tower_mission_2 INT;
+
+ALTER TABLE IF EXISTS guild_characters
+    ADD COLUMN IF NOT EXISTS tower_mission_3 INT;
+
+ALTER TABLE IF EXISTS guilds
+    ADD COLUMN IF NOT EXISTS tower_mission_page INT DEFAULT 1;
+
+ALTER TABLE IF EXISTS guilds
+    ADD COLUMN IF NOT EXISTS tower_rp INT DEFAULT 0;
+
+END;

patch-schema/03-event_quests.sql

@@ -0,0 +1,14 @@
+BEGIN;
+
+create table if not exists event_quests
+(
+    id serial primary key,
+    max_players integer,
+    quest_type integer not null,
+    quest_id integer not null,
+    mark integer
+);
+
+ALTER TABLE IF EXISTS public.servers DROP COLUMN IF EXISTS season;
+
+END;

patch-schema/04-trend-weapons.sql

@@ -0,0 +1,7 @@
+CREATE TABLE public.trend_weapons
+(
+    weapon_id integer NOT NULL,
+    weapon_type integer NOT NULL,
+    count integer DEFAULT 0,
+    PRIMARY KEY (weapon_id)
+);

patch-schema/05-gacha-roll-name.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE IF EXISTS public.gacha_entries
+    ADD COLUMN name text;
+
+END;

patch-schema/06-goocoo-rename.sql

@@ -0,0 +1,11 @@
+BEGIN;
+
+ALTER TABLE gook RENAME TO goocoo;
+
+ALTER TABLE goocoo RENAME COLUMN gook0 TO goocoo0;
+ALTER TABLE goocoo RENAME COLUMN gook1 TO goocoo1;
+ALTER TABLE goocoo RENAME COLUMN gook2 TO goocoo2;
+ALTER TABLE goocoo RENAME COLUMN gook3 TO goocoo3;
+ALTER TABLE goocoo RENAME COLUMN gook4 TO goocoo4;
+
+END;

patch-schema/07-scenarios-counter.sql

@@ -0,0 +1,9 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS scenario_counter (
+    id serial primary key,
+    scenario_id numeric not null,
+    category_id numeric not null
+);
+
+END;

patch-schema/08-kill-counts.sql

@@ -0,0 +1,12 @@
+CREATE TABLE public.kill_logs
+(
+    id serial,
+    character_id integer NOT NULL,
+    monster integer NOT NULL,
+    quantity integer NOT NULL,
+    timestamp timestamp with time zone NOT NULL,
+    PRIMARY KEY (id)
+);
+
+ALTER TABLE IF EXISTS public.guild_characters
+    ADD COLUMN box_claimed timestamp with time zone DEFAULT now();

patch-schema/09-fix-guild-treasure.sql

@@ -0,0 +1,26 @@
+BEGIN;
+
+ALTER TABLE IF EXISTS public.guild_hunts DROP COLUMN IF EXISTS hunters;
+
+ALTER TABLE IF EXISTS public.guild_characters
+    ADD COLUMN treasure_hunt integer;
+
+ALTER TABLE IF EXISTS public.guild_hunts
+    ADD COLUMN start timestamp with time zone NOT NULL DEFAULT now();
+
+UPDATE guild_hunts SET start=to_timestamp(return);
+
+ALTER TABLE IF EXISTS public.guild_hunts DROP COLUMN IF EXISTS "return";
+
+ALTER TABLE IF EXISTS public.guild_hunts
+    RENAME claimed TO collected;
+
+CREATE TABLE public.guild_hunts_claimed
+(
+    hunt_id integer NOT NULL,
+    character_id integer NOT NULL
+);
+
+ALTER TABLE IF EXISTS public.guild_hunts DROP COLUMN IF EXISTS treasure;
+
+END;

patch-schema/psn-link.sql

@@ -0,0 +1,11 @@
+BEGIN;
+
+ALTER TABLE public.sign_sessions ADD COLUMN id SERIAL;
+
+ALTER TABLE public.sign_sessions ADD CONSTRAINT sign_sessions_pkey PRIMARY KEY (id);
+
+ALTER TABLE public.sign_sessions ALTER COLUMN user_id DROP NOT NULL;
+
+ALTER TABLE public.sign_sessions ADD COLUMN psn_id TEXT;
+
+END;