From 15f02e192bc2640a0bf79b95b681729363200b69 Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Wed, 6 Feb 2019 11:35:54 +0100 Subject: [PATCH] upd(messaging): message_flags prefix in code --- messaging/repository/message.go | 2 +- messaging/repository/message_flag.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/messaging/repository/message.go b/messaging/repository/message.go index 2288d211f..765828394 100644 --- a/messaging/repository/message.go +++ b/messaging/repository/message.go @@ -160,7 +160,7 @@ func (r *message) FindMessages(filter *types.MessageFilter) (types.MessageSet, e } if filter.BookmarkedOnly || filter.PinnedOnly { - sql += " AND id IN (SELECT rel_message FROM message_flags WHERE flag = ?) " + sql += " AND id IN (SELECT rel_message FROM messaging_message_flag WHERE flag = ?) " if filter.PinnedOnly { params = append(params, types.MessageFlagBookmarkedMessage) diff --git a/messaging/repository/message_flag.go b/messaging/repository/message_flag.go index 2fbd8acb2..00d862470 100644 --- a/messaging/repository/message_flag.go +++ b/messaging/repository/message_flag.go @@ -44,14 +44,14 @@ func (r *messageFlag) With(ctx context.Context, db *factory.DB) MessageFlagRepos } func (r *messageFlag) FindByID(ID uint64) (*types.MessageFlag, error) { - sql := "SELECT * FROM message_flags WHERE id = ?" + sql := "SELECT * FROM messaging_message_flag WHERE id = ?" mod := &types.MessageFlag{} return mod, isFound(r.db().Get(mod, sql, ID), mod.ID > 0, ErrMessageFlagNotFound) } func (r *messageFlag) FindByFlag(messageID, userID uint64, flag string) (*types.MessageFlag, error) { args := []interface{}{messageID, flag} - sql := "SELECT * FROM message_flags WHERE rel_message = ? AND flag = ? " + sql := "SELECT * FROM messaging_message_flag WHERE rel_message = ? AND flag = ? " if userID > 0 { sql += "AND rel_user = ? " @@ -70,7 +70,7 @@ func (r *messageFlag) FindByMessageIDs(IDs ...uint64) ([]*types.MessageFlag, err return rval, nil } - sql := `SELECT * FROM message_flags WHERE rel_message IN (?)` + sql := `SELECT * FROM messaging_message_flag WHERE rel_message IN (?)` if sql, args, err := sqlx.In(sql, IDs); err != nil { return nil, err @@ -82,11 +82,11 @@ func (r *messageFlag) FindByMessageIDs(IDs ...uint64) ([]*types.MessageFlag, err func (r *messageFlag) Create(mod *types.MessageFlag) (*types.MessageFlag, error) { mod.ID = factory.Sonyflake.NextID() mod.CreatedAt = time.Now() - return mod, r.db().Insert("message_flags", mod) + return mod, r.db().Insert("messaging_message_flag", mod) } func (r *messageFlag) DeleteByID(ID uint64) error { - return exec(r.db().Exec("DELETE FROM message_flags WHERE id = ?", ID)) + return exec(r.db().Exec("DELETE FROM messaging_message_flag WHERE id = ?", ID)) } func (r *messageFlag) CountOwned(userID uint64) (c int, err error) {