From ebd0ea05eadcde3a2eb70bba7fc0619526d279e8 Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Sat, 23 Jul 2022 10:34:12 +1000
Subject: [PATCH] fix invalid schema

---
 Erupe/distitem.sql                           | 4 ++--
 Erupe/houseinterior.sql                      | 2 +-
 Erupe/road-shop-rotation.sql                 | 8 ++------
 Erupe/scenariocounter.sql                    | 5 ++++-
 Erupe/server/channelserver/handlers_quest.go | 9 ++++-----
 Erupe/tokensessions.sql                      | 6 +++---
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Erupe/distitem.sql b/Erupe/distitem.sql
index 4325b51e4..a72e26fa8 100644
--- a/Erupe/distitem.sql
+++ b/Erupe/distitem.sql
@@ -1,5 +1,5 @@
 BEGIN;
-CREATE TABLE public.distribution
+CREATE TABLE IF NOT EXISTS public.distribution
 (
     id serial NOT NULL PRIMARY KEY,
     character_id int,
@@ -17,7 +17,7 @@ CREATE TABLE public.distribution
     data bytea NOT NULL
 );
 
-CREATE TABLE public.distributions_accepted
+CREATE TABLE IF NOT EXISTS public.distributions_accepted
 (
     distribution_id int,
     character_id int
diff --git a/Erupe/houseinterior.sql b/Erupe/houseinterior.sql
index 048a946e5..ad0687ce7 100644
--- a/Erupe/houseinterior.sql
+++ b/Erupe/houseinterior.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
 ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN house bytea;
+    ADD COLUMN IF NOT EXISTS house bytea;
 
 END;
\ No newline at end of file
diff --git a/Erupe/road-shop-rotation.sql b/Erupe/road-shop-rotation.sql
index 034d6bfce..bfd9f9e4e 100644
--- a/Erupe/road-shop-rotation.sql
+++ b/Erupe/road-shop-rotation.sql
@@ -19,9 +19,7 @@ CREATE TABLE IF NOT EXISTS public.normal_shop_items
 );
 
 ALTER TABLE IF EXISTS public.normal_shop_items
-(
-    ADD COLUMN enable_weeks character varying(8)
-);
+    ADD COLUMN IF NOT EXISTS enable_weeks character varying(8);
 
 CREATE TABLE IF NOT EXISTS public.shop_item_state
 (
@@ -32,8 +30,6 @@ CREATE TABLE IF NOT EXISTS public.shop_item_state
 );
 
 ALTER TABLE IF EXISTS public.shop_item_state
-(
-    ADD COLUMN week int
-);
+    ADD COLUMN IF NOT EXISTS week int;
 
 END;
\ No newline at end of file
diff --git a/Erupe/scenariocounter.sql b/Erupe/scenariocounter.sql
index d859c6935..4b3b99616 100644
--- a/Erupe/scenariocounter.sql
+++ b/Erupe/scenariocounter.sql
@@ -1,6 +1,9 @@
 BEGIN;
 
 ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN scenariodata bytea;
+    ADD COLUMN IF NOT EXISTS scenariodata bytea;
+
+ALTER TABLE IF EXISTS public.characters
+    ADD COLUMN IF NOT EXISTS savefavoritequest bytea;
 
 END;
\ No newline at end of file
diff --git a/Erupe/server/channelserver/handlers_quest.go b/Erupe/server/channelserver/handlers_quest.go
index 5d3d5c83f..81cc03cdf 100644
--- a/Erupe/server/channelserver/handlers_quest.go
+++ b/Erupe/server/channelserver/handlers_quest.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"erupe-ce/network/mhfpacket"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network/mhfpacket"
 )
 
 func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
@@ -44,8 +44,8 @@ func handleMsgSysGetFile(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfLoadFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfLoadFavoriteQuest)
 	var data []byte
-	err := s.server.db.QueryRow("SELECT quest_data FROM favourite_quest WHERE char_id = $1",s.charID).Scan(&data)
-    if err == nil {
+	err := s.server.db.QueryRow("SELECT savefavoritequest FROM characters WHERE id = $1", s.charID).Scan(&data)
+	if err == nil {
 		doAckBufSucceed(s, pkt.AckHandle, data)
 	} else {
 		doAckBufSucceed(s, pkt.AckHandle, []byte{0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
@@ -54,8 +54,7 @@ func handleMsgMhfLoadFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
 
 func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfSaveFavoriteQuest)
-	s.server.db.Exec("INSERT INTO favourite_quest(char_id) VALUES($1)", s.charID)
-	s.server.db.Exec("UPDATE favourite_quest SET quest_data = $1 WHERE char_id = $2", pkt.Data, s.charID)
+	s.server.db.Exec("UPDATE characters SET savefavoritequest=$1 WHERE id=$2", pkt.Data, s.charID)
 	doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
 }
 
diff --git a/Erupe/tokensessions.sql b/Erupe/tokensessions.sql
index f067b3dd9..5696d4e25 100644
--- a/Erupe/tokensessions.sql
+++ b/Erupe/tokensessions.sql
@@ -18,12 +18,12 @@ CREATE TABLE IF NOT EXISTS public.servers
 );
 
 ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN deleted boolean NOT NULL DEFAULT false;
+    ADD COLUMN IF NOT EXISTS deleted boolean NOT NULL DEFAULT false;
 
 ALTER TABLE IF EXISTS public.characters
-    ADD COLUMN friends text NOT NULL DEFAULT '';
+    ADD COLUMN IF NOT EXISTS friends text NOT NULL DEFAULT '';
 
 ALTER TABLE IF EXISTS public.users
-    ADD COLUMN last_character int DEFAULT 0;
+    ADD COLUMN IF NOT EXISTS last_character int DEFAULT 0;
 
 END;