golang/dorisbot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change database scheema

Browse Source
This commit is contained in:
Jay
2019-07-02 09:02:31 +00:00
parent dd09bfda6e
commit 462804ed07
5 changed files with 150 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/discord/discord.go
+12 -12
View File
@@ -2,7 +2,7 @@ package discord
import (
"dorisbot/models"
cmdmodel "dorisbot/models/commands"
pubmodel "dorisbot/models/public"
"errors"
"time"
)
@@ -52,7 +52,7 @@ func NewDiscordServer(id, name string, permission int) (ds *DiscordServerModel,
// GetDiscordServerList -
func GetDiscordServerList() (list []*DiscordServerModel, err error) {
db := models.GetConn()
query := `select "id", "name", "permission", "owner", "ctime", "mtime" from discord_server`
query := `select "id", "name", "permission", "owner", "ctime", "mtime" from discord.server`
err = db.Select(&list, query)
if err != nil {
return nil, err
@@ -67,7 +67,7 @@ func GetDiscordServerByID(id string) (ds *DiscordServerModel, err error) {
}
db := models.GetConn()
ds = &DiscordServerModel{}
query := `select "id", "name", "permission", "owner", "ctime", "mtime" from discord_server where "id" = $1`
query := `select "id", "name", "permission", "owner", "ctime", "mtime" from discord.server where "id" = $1`
err = db.Get(ds, query, id)
return
}
@@ -75,7 +75,7 @@ func GetDiscordServerByID(id string) (ds *DiscordServerModel, err error) {
// Write DiscordServer data to database
func (p *DiscordServerModel) Write() error {
db := models.GetConn()
query := `insert into discord_server ("id", "name", "permission", "owner") values (:id, :name, :permission, :owner) returning *`
query := `insert into discord.server ("id", "name", "permission", "owner") values (:id, :name, :permission, :owner) returning *`
row, err := db.NamedQuery(query, p)
if err != nil {
return err
@@ -93,7 +93,7 @@ func (p *DiscordServerModel) ChangeName(name string) (err error) {
return errors.New("name is empty")
}
db := models.GetConn()
query := `update discord_server set "name" = $1, "mtime" = now() where "id" = $2`
query := `update discord.server set "name" = $1, "mtime" = now() where "id" = $2`
_, err = db.Exec(query, name, p.ID)
if err != nil {
return err
@@ -105,7 +105,7 @@ func (p *DiscordServerModel) ChangeName(name string) (err error) {
// GetChannelList -
func (p *DiscordServerModel) GetChannelList() (list []*DiscordChannelModel, err error) {
db := models.GetConn()
query := `select "id", "server", "enable_cmd", "enable_notify", "ctime", "mtime" from discord_channel where "server" = $1`
query := `select "id", "server", "enable_cmd", "enable_notify", "ctime", "mtime" from discord.channel where "server" = $1`
err = db.Select(&list, query, p.ID)
if err != nil {
return nil, err
@@ -120,15 +120,15 @@ func (p *DiscordServerModel) GetChannel(id string) (ch *DiscordChannelModel, err
}
db := models.GetConn()
ch = &DiscordChannelModel{}
query := `select "id", "server", "enable_cmd", "enable_notify", "ctime", "mtime" from discord_channel where "id" = $1 and "server" = $2`
query := `select "id", "server", "enable_cmd", "enable_notify", "ctime", "mtime" from discord.channel where "id" = $1 and "server" = $2`
err = db.Get(ch, query, id, p.ID)
return
}
// GetCommandList -
func (p *DiscordServerModel) GetCommandList() (cmds []*cmdmodel.CommandsModel, err error) {
func (p *DiscordServerModel) GetCommandList() (cmds []*pubmodel.CommandModel, err error) {
db := models.GetConn()
query := `select "cmd", "server", "value", "require_init", "require_manage", "ctime", "mtime" from "commands" where "server" = $1`
query := `select "cmd", "server", "value", "require_init", "require_manage", "ctime", "mtime" from public."command" where "server" = $1`
err = db.Select(&cmds, query, p.ID)
if err != nil {
return nil, err
@@ -139,7 +139,7 @@ func (p *DiscordServerModel) GetCommandList() (cmds []*cmdmodel.CommandsModel, e
// GetRoleList -
func (p *DiscordServerModel) GetRoleList() (list []*DiscordManageRoleModel, err error) {
db := models.GetConn()
query := `select "server", "role_id", "role_name", "ctime", "mtime" from "discord_manage_role" where "server" = $1`
query := `select "server", "role_id", "role_name", "ctime", "mtime" from "discord"."manage_role" where "server" = $1`
err = db.Select(&list, query, p.ID)
if err != nil {
return nil, err
@@ -154,7 +154,7 @@ func (p *DiscordServerModel) GetRole(roleID string) (role *DiscordManageRoleMode
}
db := models.GetConn()
role = &DiscordManageRoleModel{}
query := `select "server", "role_id", "role_name", "ctime", "mtime" from "discord_manage_role" where "server" = $1 and "rold_id" = $2`
query := `select "server", "role_id", "role_name", "ctime", "mtime" from "discord"."manage_role" where "server" = $1 and "rold_id" = $2`
err = db.Get(role, query, p.ID, roleID)
if err != nil {
return nil, err
@@ -165,7 +165,7 @@ func (p *DiscordServerModel) GetRole(roleID string) (role *DiscordManageRoleMode
// AddChannel -
func (p *DiscordServerModel) AddChannel(id string, enableCMD, enableNotify bool) (err error) {
db := models.GetConn()
query := `insert into discord_channel ("id", "server", "enable_cmd", "enable_notify", "ctime", "mtime") values
query := `insert into discord.channel ("id", "server", "enable_cmd", "enable_notify", "ctime", "mtime") values
($1, $2, $3, $4, now(), now())`
_, err = db.Exec(query, id, p.ID, enableCMD, enableNotify)
if err != nil {