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

Move Matrix state store to main database. Fixes #64

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-25 16:29:35 +03:00
parent 15b0798cdd
commit ab91d326fd
9 changed files with 370 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
database/database.go
View File

@ -29,7 +29,8 @@ import (
type Database struct {
*sql.DB
log log.Logger
log log.Logger
dialect string
User *UserQuery
Portal *PortalQuery
@ -48,8 +49,9 @@ func New(dbType string, uri string) (*Database, error) {
}
db := &Database{
DB: conn,
log: log.Sub("Database"),
DB: conn,
log: log.Sub("Database"),
dialect: dbType,
}
db.User = &UserQuery{
db: db,
@ -70,8 +72,8 @@ func New(dbType string, uri string) (*Database, error) {
return db, nil
}
func (db *Database) Init(dialectName string) error {
return upgrades.Run(db.log.Sub("Upgrade"), dialectName, db.DB)
func (db *Database) Init() error {
return upgrades.Run(db.log.Sub("Upgrade"), db.dialect, db.DB)
}
type Scannable interface {