BreizhHardware/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2026-03-18 21:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistency

Browse Source
This commit is contained in:
binwiederhier
2026-02-23 11:17:57 -05:00
parent 811c7ae25a
commit 90d0eca14d
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
message/store.go
View File

@@ -299,6 +299,8 @@ func (c *commonStore) Message(id string) (*model.Message, error) {
// UpdateMessageTime updates the time column for a message by ID. This is only used for testing. // UpdateMessageTime updates the time column for a message by ID. This is only used for testing.
func (c *commonStore) UpdateMessageTime(messageID string, timestamp int64) error { func (c *commonStore) UpdateMessageTime(messageID string, timestamp int64) error {
c.maybeLock()
defer c.maybeUnlock()
_, err := c.db.Exec(c.queries.updateMessageTime, timestamp, messageID) _, err := c.db.Exec(c.queries.updateMessageTime, timestamp, messageID)
return err return err
} }

2
webpush/store.go
View File

@@ -157,7 +157,7 @@ func (s *commonStore) RemoveExpiredSubscriptions(expireAfter time.Duration) erro
} }
// SetSubscriptionUpdatedAt updates the updated_at timestamp for a subscription by endpoint. This is // SetSubscriptionUpdatedAt updates the updated_at timestamp for a subscription by endpoint. This is
// exported for testing purposes and is not part of the Store interface. // exported for testing purposes.
func (s *commonStore) SetSubscriptionUpdatedAt(endpoint string, updatedAt int64) error { func (s *commonStore) SetSubscriptionUpdatedAt(endpoint string, updatedAt int64) error {
_, err := s.db.Exec(s.queries.updateSubscriptionUpdatedAt, updatedAt, endpoint) _, err := s.db.Exec(s.queries.updateSubscriptionUpdatedAt, updatedAt, endpoint)
return err return err

15
webpush/store_sqlite.go
View File

@@ -9,7 +9,6 @@ import (
const ( const (
sqliteCreateWebPushSubscriptionsTableQuery = ` sqliteCreateWebPushSubscriptionsTableQuery = `
BEGIN;
CREATE TABLE IF NOT EXISTS subscription ( CREATE TABLE IF NOT EXISTS subscription (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
endpoint TEXT NOT NULL, endpoint TEXT NOT NULL,
@@ -32,8 +31,7 @@ const (
CREATE TABLE IF NOT EXISTS schemaVersion ( CREATE TABLE IF NOT EXISTS schemaVersion (
id INT PRIMARY KEY, id INT PRIMARY KEY,
version INT NOT NULL version INT NOT NULL
); );
COMMIT;
` `
sqliteBuiltinStartupQueries = ` sqliteBuiltinStartupQueries = `
PRAGMA foreign_keys = ON; PRAGMA foreign_keys = ON;
@@ -122,13 +120,18 @@ func setupSQLite(db *sql.DB) error {
} }
func setupNewSQLite(db *sql.DB) error { func setupNewSQLite(db *sql.DB) error {
if _, err := db.Exec(sqliteCreateWebPushSubscriptionsTableQuery); err != nil { tx, err := db.Begin()
if err != nil {
return err return err
} }
if _, err := db.Exec(sqliteInsertWebPushSchemaVersionQuery, sqliteCurrentWebPushSchemaVersion); err != nil { defer tx.Rollback()
if _, err := tx.Exec(sqliteCreateWebPushSubscriptionsTableQuery); err != nil {
return err return err
} }
return nil if _, err := tx.Exec(sqliteInsertWebPushSchemaVersionQuery, sqliteCurrentWebPushSchemaVersion); err != nil {
return err
}
return tx.Commit()
} }
func runSQLiteStartupQueries(db *sql.DB, startupQueries string) error { func runSQLiteStartupQueries(db *sql.DB, startupQueries string) error {