updaye database , and model

This commit is contained in:
Jay
2019-07-02 10:05:26 +00:00
parent 462804ed07
commit 30d38d6d20
5 changed files with 95 additions and 34 deletions
+5 -1
View File
@@ -1,6 +1,7 @@
package discord
import (
"database/sql"
"dorisbot/models"
pubmodel "dorisbot/models/public"
"errors"
@@ -69,6 +70,9 @@ func GetDiscordServerByID(id string) (ds *DiscordServerModel, err error) {
ds = &DiscordServerModel{}
query := `select "id", "name", "permission", "owner", "ctime", "mtime" from discord.server where "id" = $1`
err = db.Get(ds, query, id)
if err == sql.ErrNoRows {
return nil, nil
}
return
}
@@ -156,7 +160,7 @@ func (p *DiscordServerModel) GetRole(roleID string) (role *DiscordManageRoleMode
role = &DiscordManageRoleModel{}
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 {
if err != nil && err != sql.ErrNoRows {
return nil, err
}
return
+1 -5
View File
@@ -20,16 +20,12 @@ var x *sqlx.DB
// NewDB -
func NewDB(conf *config.Database) (*sqlx.DB, error) {
var err error
connStr := fmt.Sprintf("dbname=%s user=%s password=%s host=%s port=%d sslmode=%s sslrootcert=%s sslcert=%s sslkey=%s",
connStr := fmt.Sprintf("dbname=%s user=%s password=%s host=%s port=%d sslmode=disable",
conf.DBName,
conf.User,
conf.Pass,
conf.Host,
conf.Port,
conf.SSLMode,
conf.SSLCa,
conf.SSLCrt,
conf.SSLKey,
)
log.Println("DB Connstr :: ", connStr)