LordMZTE/mautrix-whatsapp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1 from MonokelPinguin/develop

Browse source 
Make sqlite and postgres more similar
This commit is contained in:
Dominic Renner 2019-03-06 23:11:09 +01:00 committed by GitHub
commit cf6d8f6eb0
3 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
database/database.go
View file

@ -20,6 +20,7 @@ import (
"database/sql" "database/sql"
_ "github.com/lib/pq" _ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
log "maunium.net/go/maulogger/v2" log "maunium.net/go/maulogger/v2"
) )

16
database/message.go
View file

@ -18,6 +18,7 @@ package database
import ( import (
"bytes" "bytes"
"strings"
"database/sql" "database/sql"
"encoding/json" "encoding/json"
@ -34,6 +35,7 @@ type MessageQuery struct {
} }
func (mq *MessageQuery) CreateTable(dbType string) error { func (mq *MessageQuery) CreateTable(dbType string) error {
if strings.ToLower(dbType) == "postgres" {
_, err := mq.db.Exec(`CREATE TABLE IF NOT EXISTS message ( _, err := mq.db.Exec(`CREATE TABLE IF NOT EXISTS message (
chat_jid VARCHAR(255), chat_jid VARCHAR(255),
chat_receiver VARCHAR(255), chat_receiver VARCHAR(255),
@ -46,6 +48,20 @@ func (mq *MessageQuery) CreateTable(dbType string) error {
FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver) FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver)
)`) )`)
return err return err
} else {
_, err := mq.db.Exec(`CREATE TABLE IF NOT EXISTS message (
chat_jid VARCHAR(255),
chat_receiver VARCHAR(255),
jid VARCHAR(255),
mxid VARCHAR(255) NOT NULL UNIQUE,
sender VARCHAR(255) NOT NULL,
content BLOB NOT NULL,
PRIMARY KEY (chat_jid, chat_receiver, jid),
FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver)
)`)
return err
}
} }
func (mq *MessageQuery) New() *Message { func (mq *MessageQuery) New() *Message {

14
database/user.go
View file

@ -35,7 +35,7 @@ type UserQuery struct {
func (uq *UserQuery) CreateTable(dbType string) error { func (uq *UserQuery) CreateTable(dbType string) error {
if strings.ToLower(dbType) == "postgres" { if strings.ToLower(dbType) == "postgres" {
_, err := uq.db.Exec(`CREATE TABLE IF NOT EXISTS whatsapp_user ( _, err := uq.db.Exec(`CREATE TABLE IF NOT EXISTS "user" (
mxid VARCHAR(255) PRIMARY KEY, mxid VARCHAR(255) PRIMARY KEY,
jid VARCHAR(255) UNIQUE, jid VARCHAR(255) UNIQUE,
@ -49,7 +49,7 @@ func (uq *UserQuery) CreateTable(dbType string) error {
)`) )`)
return err return err
} else { } else {
_, err := uq.db.Exec(`CREATE TABLE IF NOT EXISTS whatsapp_user ( _, err := uq.db.Exec(`CREATE TABLE IF NOT EXISTS "user" (
mxid VARCHAR(255) PRIMARY KEY, mxid VARCHAR(255) PRIMARY KEY,
jid VARCHAR(255) UNIQUE, jid VARCHAR(255) UNIQUE,
@ -73,7 +73,7 @@ func (uq *UserQuery) New() *User {
} }
func (uq *UserQuery) GetAll() (users []*User) { func (uq *UserQuery) GetAll() (users []*User) {
rows, err := uq.db.Query("SELECT * FROM whatsapp_user") rows, err := uq.db.Query(`SELECT * FROM "user"`)
if err != nil || rows == nil { if err != nil || rows == nil {
return nil return nil
} }
@ -85,7 +85,7 @@ func (uq *UserQuery) GetAll() (users []*User) {
} }
func (uq *UserQuery) GetByMXID(userID types.MatrixUserID) *User { func (uq *UserQuery) GetByMXID(userID types.MatrixUserID) *User {
row := uq.db.QueryRow("SELECT * FROM whatsapp_user WHERE mxid=$1", userID) row := uq.db.QueryRow(`SELECT * FROM "user" WHERE mxid=$1`, userID)
if row == nil { if row == nil {
return nil return nil
} }
@ -93,7 +93,7 @@ func (uq *UserQuery) GetByMXID(userID types.MatrixUserID) *User {
} }
func (uq *UserQuery) GetByJID(userID types.WhatsAppID) *User { func (uq *UserQuery) GetByJID(userID types.WhatsAppID) *User {
row := uq.db.QueryRow("SELECT * FROM whatsapp_user WHERE jid=$1", stripSuffix(userID)) row := uq.db.QueryRow(`SELECT * FROM "user" WHERE jid=$1`, stripSuffix(userID))
if row == nil { if row == nil {
return nil return nil
} }
@ -166,7 +166,7 @@ func (user *User) sessionUnptr() (sess whatsapp.Session) {
func (user *User) Insert() { func (user *User) Insert() {
sess := user.sessionUnptr() sess := user.sessionUnptr()
_, err := user.db.Exec("INSERT INTO whatsapp_user VALUES ($1, $2, $3, $4, $5, $6, $7, $8)", user.MXID, user.jidPtr(), _, err := user.db.Exec(`INSERT INTO "user" VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`, user.MXID, user.jidPtr(),
user.ManagementRoom, user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey) sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey)
if err != nil { if err != nil {
@ -176,7 +176,7 @@ func (user *User) Insert() {
func (user *User) Update() { func (user *User) Update() {
sess := user.sessionUnptr() sess := user.sessionUnptr()
_, err := user.db.Exec("UPDATE whatsapp_user SET jid=$1, management_room=$2, client_id=$3, client_token=$4, server_token=$5, enc_key=$6, mac_key=$7 WHERE mxid=$8", _, err := user.db.Exec(`UPDATE "user" SET jid=$1, management_room=$2, client_id=$3, client_token=$4, server_token=$5, enc_key=$6, mac_key=$7 WHERE mxid=$8`,
user.jidPtr(), user.ManagementRoom, user.jidPtr(), user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey,
user.MXID) user.MXID)