watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data storage and other things

Browse Source
This commit is contained in:
Tulir Asokan
2018-08-16 19:20:07 +03:00
parent 9c48eeb534
commit 141eba644b
13 changed files with 158 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
database/database.go
View File

@ -24,7 +24,7 @@ import (
type Database struct {
*sql.DB
log *log.Sublogger
log log.Logger
User *UserQuery
Portal *PortalQuery
@ -39,23 +39,29 @@ func New(file string) (*Database, error) {
db := &Database{
DB: conn,
log: log.CreateSublogger("Database", log.LevelDebug),
log: log.Sub("Database"),
}
db.User = &UserQuery{
db: db,
log: log.CreateSublogger("Database/User", log.LevelDebug),
log: db.log.Sub("User"),
}
db.Portal = &PortalQuery{
db: db,
log: log.CreateSublogger("Database/Portal", log.LevelDebug),
log: db.log.Sub("Portal"),
}
db.Puppet = &PuppetQuery{
db: db,
log: log.CreateSublogger("Database/Puppet", log.LevelDebug),
log: db.log.Sub("Puppet"),
}
return db, nil
}
func (db *Database) CreateTables() {
db.User.CreateTable()
db.Portal.CreateTable()
db.Puppet.CreateTable()
}
type Scannable interface {
Scan(...interface{}) error
}

4
database/portal.go
View File

@ -22,7 +22,7 @@ import (
type PortalQuery struct {
db *Database
log *log.Sublogger
log log.Logger
}
func (pq *PortalQuery) CreateTable() error {
@ -74,7 +74,7 @@ func (pq *PortalQuery) get(query string, args ...interface{}) *Portal {
type Portal struct {
db *Database
log *log.Sublogger
log log.Logger
JID string
MXID string

4
database/puppet.go
View File

@ -22,7 +22,7 @@ import (
type PuppetQuery struct {
db *Database
log *log.Sublogger
log log.Logger
}
func (pq *PuppetQuery) CreateTable() error {
@ -67,7 +67,7 @@ func (pq *PuppetQuery) Get(jid, receiver string) *Puppet {
type Puppet struct {
db *Database
log *log.Sublogger
log log.Logger
JID string
Receiver string

4
database/user.go
View File

@ -23,7 +23,7 @@ import (
type UserQuery struct {
db *Database
log *log.Sublogger
log log.Logger
}
func (uq *UserQuery) CreateTable() error {
@ -71,7 +71,7 @@ func (uq *UserQuery) Get(userID string) *User {
type User struct {
db *Database
log *log.Sublogger
log log.Logger
UserID string
ManagementRoom string