From 62ef0516c6f14921df587cf83018614a91e7a922 Mon Sep 17 00:00:00 2001 From: shoopea Date: Tue, 13 Aug 2019 11:09:44 +0800 Subject: [PATCH] test new contraints/keys for obj_msg --- msg.go | 20 +++++++++++--------- sql.go | 6 +++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/msg.go b/msg.go index e46ff87..b5efb82 100644 --- a/msg.go +++ b/msg.go @@ -137,15 +137,17 @@ func parseSubTypeMessageGRolesAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa } else { cwm.TreasurerID64 = 0 } - log.Printf("parseSubTypeMessageGRolesAck : Guild roles Ack identified\n") - log.Printf("parseSubTypeMessageGRolesAck : Bartender : %s\n", r.ReplaceAllString(m.Text, "${Bartender}")) - log.Printf("parseSubTypeMessageGRolesAck : Commander : %s\n", r.ReplaceAllString(m.Text, "${Commander}")) - log.Printf("parseSubTypeMessageGRolesAck : Squire : %s\n", r.ReplaceAllString(m.Text, "${Squire}")) - log.Printf("parseSubTypeMessageGRolesAck : Treasurer : %s\n", r.ReplaceAllString(m.Text, "${Treasurer}")) - log.Printf("cwm.BartenderID64 : %d\n", cwm.BartenderID64) - log.Printf("cwm.CommanderID64 : %d\n", cwm.CommanderID64) - log.Printf("cwm.SquireID64 : %d\n", cwm.SquireID64) - log.Printf("cwm.TreasurerID64 : %d\n", cwm.TreasurerID64) + /* + log.Printf("parseSubTypeMessageGRolesAck : Guild roles Ack identified\n") + log.Printf("parseSubTypeMessageGRolesAck : Bartender : %s\n", r.ReplaceAllString(m.Text, "${Bartender}")) + log.Printf("parseSubTypeMessageGRolesAck : Commander : %s\n", r.ReplaceAllString(m.Text, "${Commander}")) + log.Printf("parseSubTypeMessageGRolesAck : Squire : %s\n", r.ReplaceAllString(m.Text, "${Squire}")) + log.Printf("parseSubTypeMessageGRolesAck : Treasurer : %s\n", r.ReplaceAllString(m.Text, "${Treasurer}")) + log.Printf("cwm.BartenderID64 : %d\n", cwm.BartenderID64) + log.Printf("cwm.CommanderID64 : %d\n", cwm.CommanderID64) + log.Printf("cwm.SquireID64 : %d\n", cwm.SquireID64) + log.Printf("cwm.TreasurerID64 : %d\n", cwm.TreasurerID64) + */ return &cwm, nil } diff --git a/sql.go b/sql.go index 75ebae6..61aa939 100644 --- a/sql.go +++ b/sql.go @@ -130,12 +130,12 @@ func initDB() { obj_id BIGINT UNSIGNED NOT NULL ,msg_id BIGINT NOT NULL ,chat_id BIGINT NOT NULL - ,user_id BIGINT NOT NULL - ,sender_user_id BIGINT NOT NULL + ,user_id BIGINT NOT NULL CHECK (user_id > 0) + ,sender_user_id BIGINT NOT NULL CHECK (sender_user_id > 0) ,date DATETIME NOT NULL ,text VARCHAR(4096) NOT NULL ,FOREIGN KEY (obj_id) REFERENCES obj(id) ON DELETE CASCADE - ,UNIQUE KEY (msg_id, chat_id, sender_user_id) + ,UNIQUE KEY (msg_id, chat_id, user_id, sender_user_id) ) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_bin;`) failOnError(err, "initDB : create table obj_msg") log.Println("initDB : obj_msg created ...")