fix invalid schema

This commit is contained in:
wish
2022-07-23 10:34:12 +10:00
parent c5fa728c5a
commit ebd0ea05ea
6 changed files with 16 additions and 18 deletions

View File

@@ -1,5 +1,5 @@
BEGIN; BEGIN;
CREATE TABLE public.distribution CREATE TABLE IF NOT EXISTS public.distribution
( (
id serial NOT NULL PRIMARY KEY, id serial NOT NULL PRIMARY KEY,
character_id int, character_id int,
@@ -17,7 +17,7 @@ CREATE TABLE public.distribution
data bytea NOT NULL data bytea NOT NULL
); );
CREATE TABLE public.distributions_accepted CREATE TABLE IF NOT EXISTS public.distributions_accepted
( (
distribution_id int, distribution_id int,
character_id int character_id int

View File

@@ -1,6 +1,6 @@
BEGIN; BEGIN;
ALTER TABLE IF EXISTS public.characters ALTER TABLE IF EXISTS public.characters
ADD COLUMN house bytea; ADD COLUMN IF NOT EXISTS house bytea;
END; END;

View File

@@ -19,9 +19,7 @@ CREATE TABLE IF NOT EXISTS public.normal_shop_items
); );
ALTER TABLE IF EXISTS public.normal_shop_items ALTER TABLE IF EXISTS public.normal_shop_items
( ADD COLUMN IF NOT EXISTS enable_weeks character varying(8);
ADD COLUMN enable_weeks character varying(8)
);
CREATE TABLE IF NOT EXISTS public.shop_item_state 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 ALTER TABLE IF EXISTS public.shop_item_state
( ADD COLUMN IF NOT EXISTS week int;
ADD COLUMN week int
);
END; END;

View File

@@ -1,6 +1,9 @@
BEGIN; BEGIN;
ALTER TABLE IF EXISTS public.characters 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; END;

View File

@@ -6,8 +6,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"erupe-ce/network/mhfpacket"
"erupe-ce/common/byteframe" "erupe-ce/common/byteframe"
"erupe-ce/network/mhfpacket"
) )
func handleMsgSysGetFile(s *Session, p mhfpacket.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) { func handleMsgMhfLoadFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfLoadFavoriteQuest) pkt := p.(*mhfpacket.MsgMhfLoadFavoriteQuest)
var data []byte var data []byte
err := s.server.db.QueryRow("SELECT quest_data FROM favourite_quest WHERE char_id = $1",s.charID).Scan(&data) err := s.server.db.QueryRow("SELECT savefavoritequest FROM characters WHERE id = $1", s.charID).Scan(&data)
if err == nil { if err == nil {
doAckBufSucceed(s, pkt.AckHandle, data) doAckBufSucceed(s, pkt.AckHandle, data)
} else { } else {
doAckBufSucceed(s, pkt.AckHandle, []byte{0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}) 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) { func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfSaveFavoriteQuest) pkt := p.(*mhfpacket.MsgMhfSaveFavoriteQuest)
s.server.db.Exec("INSERT INTO favourite_quest(char_id) VALUES($1)", s.charID) s.server.db.Exec("UPDATE characters SET savefavoritequest=$1 WHERE id=$2", pkt.Data, s.charID)
s.server.db.Exec("UPDATE favourite_quest SET quest_data = $1 WHERE char_id = $2", pkt.Data, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
} }

View File

@@ -18,12 +18,12 @@ CREATE TABLE IF NOT EXISTS public.servers
); );
ALTER TABLE IF EXISTS public.characters 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 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 ALTER TABLE IF EXISTS public.users
ADD COLUMN last_character int DEFAULT 0; ADD COLUMN IF NOT EXISTS last_character int DEFAULT 0;
END; END;