Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Upgrade goext

Browse Source
This commit is contained in:
Mike Schwörer
2024-05-31 23:56:16 +02:00
parent d5d89ee93a
commit 7553e1f51e
28 changed files with 210 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scnserver/db/dbtools/preprocessor.go
View File

@@ -75,7 +75,7 @@ func (pp *DBPreprocessor) Init(ctx context.Context) error {
if err != nil {
return err
}
resrows1, err := sq.ScanAll[tabInfo](rows1, sq.SModeFast, sq.Unsafe, true)
resrows1, err := sq.ScanAll[tabInfo](ctx, pp.db, rows1, sq.SModeFast, sq.Unsafe, true)
if err != nil {
return err
}
@@ -85,7 +85,7 @@ func (pp *DBPreprocessor) Init(ctx context.Context) error {
if err != nil {
return err
}
resrows2, err := sq.ScanAll[colInfo](rows2, sq.SModeFast, sq.Unsafe, true)
resrows2, err := sq.ScanAll[colInfo](ctx, pp.db, rows2, sq.SModeFast, sq.Unsafe, true)
if err != nil {
return err
}

2
scnserver/db/impl/logs/database.go
View File

@@ -42,7 +42,7 @@ func NewLogsDatabase(cfg server.Config) (*Database, error) {
xdb.SetConnMaxIdleTime(60 * time.Minute)
}
qqdb := sq.NewDB(xdb)
qqdb := sq.NewDB(xdb, sq.DBOptions{})
if conf.EnableLogger {
qqdb.AddListener(dbtools.DBLogger{})

12
scnserver/db/impl/primary/channels.go
View File

@@ -23,7 +23,7 @@ func (db *Database) GetChannelByName(ctx db.TxContext, userid models.UserID, cha
return nil, err
}
channel, err := models.DecodeChannel(rows)
channel, err := models.DecodeChannel(ctx, tx, rows)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
@@ -47,7 +47,7 @@ func (db *Database) GetChannelByID(ctx db.TxContext, chanid models.ChannelID) (*
return nil, err
}
channel, err := models.DecodeChannel(rows)
channel, err := models.DecodeChannel(ctx, tx, rows)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
@@ -108,7 +108,7 @@ func (db *Database) ListChannelsByOwner(ctx db.TxContext, userid models.UserID,
return nil, err
}
data, err := models.DecodeChannelsWithSubscription(rows)
data, err := models.DecodeChannelsWithSubscription(ctx, tx, rows)
if err != nil {
return nil, err
}
@@ -138,7 +138,7 @@ func (db *Database) ListChannelsBySubscriber(ctx db.TxContext, userid models.Use
return nil, err
}
data, err := models.DecodeChannelsWithSubscription(rows)
data, err := models.DecodeChannelsWithSubscription(ctx, tx, rows)
if err != nil {
return nil, err
}
@@ -169,7 +169,7 @@ func (db *Database) ListChannelsByAccess(ctx db.TxContext, userid models.UserID,
return nil, err
}
data, err := models.DecodeChannelsWithSubscription(rows)
data, err := models.DecodeChannelsWithSubscription(ctx, tx, rows)
if err != nil {
return nil, err
}
@@ -203,7 +203,7 @@ func (db *Database) GetChannel(ctx db.TxContext, userid models.UserID, channelid
return models.ChannelWithSubscription{}, err
}
channel, err := models.DecodeChannelWithSubscription(rows)
channel, err := models.DecodeChannelWithSubscription(ctx, tx, rows)
if err != nil {
return models.ChannelWithSubscription{}, err
}

4
scnserver/db/impl/primary/clients.go
View File

@@ -56,7 +56,7 @@ func (db *Database) ListClients(ctx db.TxContext, userid models.UserID) ([]model
return nil, err
}
data, err := models.DecodeClients(rows)
data, err := models.DecodeClients(ctx, tx, rows)
if err != nil {
return nil, err
}
@@ -78,7 +78,7 @@ func (db *Database) GetClient(ctx db.TxContext, userid models.UserID, clientid m
return models.Client{}, err
}
client, err := models.DecodeClient(rows)
client, err := models.DecodeClient(ctx, tx, rows)
if err != nil {
return models.Client{}, err
}

2
scnserver/db/impl/primary/database.go
View File

@@ -42,7 +42,7 @@ func NewPrimaryDatabase(cfg server.Config) (*Database, error) {
xdb.SetConnMaxIdleTime(60 * time.Minute)
}
qqdb := sq.NewDB(xdb)
qqdb := sq.NewDB(xdb, sq.DBOptions{})
if conf.EnableLogger {
qqdb.AddListener(dbtools.DBLogger{})

2
scnserver/db/impl/primary/deliveries.go
View File

@@ -82,7 +82,7 @@ func (db *Database) ListRetrieableDeliveries(ctx db.TxContext, pageSize int) ([]
return nil, err
}
data, err := models.DecodeDeliveries(rows)
data, err := models.DecodeDeliveries(ctx, tx, rows)
if err != nil {
return nil, err
}

6
scnserver/db/impl/primary/keytokens.go
View File

@@ -49,7 +49,7 @@ func (db *Database) ListKeyTokens(ctx db.TxContext, ownerID models.UserID) ([]mo
return nil, err
}
data, err := models.DecodeKeyTokens(rows)
data, err := models.DecodeKeyTokens(ctx, tx, rows)
if err != nil {
return nil, err
}
@@ -71,7 +71,7 @@ func (db *Database) GetKeyToken(ctx db.TxContext, userid models.UserID, keyToken
return models.KeyToken{}, err
}
keyToken, err := models.DecodeKeyToken(rows)
keyToken, err := models.DecodeKeyToken(ctx, tx, rows)
if err != nil {
return models.KeyToken{}, err
}
@@ -90,7 +90,7 @@ func (db *Database) GetKeyTokenByToken(ctx db.TxContext, key string) (*models.Ke
return nil, err
}
user, err := models.DecodeKeyToken(rows)
user, err := models.DecodeKeyToken(ctx, tx, rows)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}

6
scnserver/db/impl/primary/messages.go
View File

@@ -21,7 +21,7 @@ func (db *Database) GetMessageByUserMessageID(ctx db.TxContext, usrMsgId string)
return nil, err
}
msg, err := models.DecodeMessage(rows)
msg, err := models.DecodeMessage(ctx, tx, rows)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
@@ -50,7 +50,7 @@ func (db *Database) GetMessage(ctx db.TxContext, scnMessageID models.MessageID,
return models.Message{}, err
}
msg, err := models.DecodeMessage(rows)
msg, err := models.DecodeMessage(ctx, tx, rows)
if err != nil {
return models.Message{}, err
}
@@ -138,7 +138,7 @@ func (db *Database) ListMessages(ctx db.TxContext, filter models.MessageFilter,
return nil, ct.CursorToken{}, err
}
data, err := models.DecodeMessages(rows)
data, err := models.DecodeMessages(ctx, tx, rows)
if err != nil {
return nil, ct.CursorToken{}, err
}

6
scnserver/db/impl/primary/subscriptions.go
View File

@@ -50,7 +50,7 @@ func (db *Database) ListSubscriptions(ctx db.TxContext, filter models.Subscripti
return nil, err
}
data, err := models.DecodeSubscriptions(rows)
data, err := models.DecodeSubscriptions(ctx, tx, rows)
if err != nil {
return nil, err
}
@@ -69,7 +69,7 @@ func (db *Database) GetSubscription(ctx db.TxContext, subid models.SubscriptionI
return models.Subscription{}, err
}
sub, err := models.DecodeSubscription(rows)
sub, err := models.DecodeSubscription(ctx, tx, rows)
if err != nil {
return models.Subscription{}, err
}
@@ -91,7 +91,7 @@ func (db *Database) GetSubscriptionBySubscriber(ctx db.TxContext, subscriberId m
return nil, err
}
user, err := models.DecodeSubscription(rows)
user, err := models.DecodeSubscription(ctx, tx, rows)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}

2
scnserver/db/impl/primary/users.go
View File

@@ -61,7 +61,7 @@ func (db *Database) GetUser(ctx db.TxContext, userid models.UserID) (models.User
return models.User{}, err
}
user, err := models.DecodeUser(rows)
user, err := models.DecodeUser(ctx, tx, rows)
if err != nil {
return models.User{}, err
}

4
scnserver/db/impl/requests/database.go
View File

@@ -42,7 +42,7 @@ func NewRequestsDatabase(cfg server.Config) (*Database, error) {
xdb.SetConnMaxIdleTime(60 * time.Minute)
}
qqdb := sq.NewDB(xdb)
qqdb := sq.NewDB(xdb, sq.DBOptions{})
if conf.EnableLogger {
qqdb.AddListener(dbtools.DBLogger{})
@@ -92,7 +92,7 @@ func (db *Database) Migrate(outerctx context.Context) error {
schemastr := schema.RequestsSchema[schema.RequestsSchemaVersion].SQL
schemahash := schema.RequestsSchema[schema.RequestsSchemaVersion].Hash
schemahash, err := sq.HashSqliteSchema(tctx, schemastr)
schemahash, err := sq.HashMattnSqliteSchema(tctx, schemastr)
if err != nil {
return err
}

2
scnserver/db/impl/requests/requestlogs.go
View File

@@ -78,7 +78,7 @@ func (db *Database) ListRequestLogs(ctx context.Context, filter models.RequestLo
return nil, ct.CursorToken{}, err
}
data, err := models.DecodeRequestLogs(rows)
data, err := models.DecodeRequestLogs(ctx, db.db, rows)
if err != nil {
return nil, ct.CursorToken{}, err
}