multipleof4/ntfy
1
0
Fork 0
mirror of https://github.com/multipleof4/ntfy.git synced 2026-10-17 00:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Manual fixes

Browse Source
This commit is contained in:
binwiederhier
2026-03-02 12:58:01 -05:00
parent 11c79a6369
commit 0e6b467cf0
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/cache_postgres.go
+2 -2
View File
@@ -75,7 +75,7 @@ const (
postgresUpdateMessageTimeQuery = `UPDATE message SET time = $1 WHERE mid = $2` postgresUpdateMessageTimeQuery = `UPDATE message SET time = $1 WHERE mid = $2`
) )
var pgQueries = queries{ var postgresQueries = queries{
insertMessage: postgresInsertMessageQuery, insertMessage: postgresInsertMessageQuery,
deleteMessage: postgresDeleteMessageQuery, deleteMessage: postgresDeleteMessageQuery,
selectScheduledMessageIDsBySeqID: postgresSelectScheduledMessageIDsBySeqIDQuery, selectScheduledMessageIDsBySeqID: postgresSelectScheduledMessageIDsBySeqIDQuery,
@@ -106,5 +106,5 @@ func NewPostgresStore(db *sql.DB, batchSize int, batchTimeout time.Duration) (*C
if err := setupPostgres(db); err != nil { if err := setupPostgres(db); err != nil {
return nil, err return nil, err
} }
return newCache(db, pgQueries, nil, batchSize, batchTimeout, false), nil return newCache(db, postgresQueries, nil, batchSize, batchTimeout, false), nil
} }
server/server_test.go
+2 -3
View File
@@ -2999,11 +2999,10 @@ func TestServer_MessageHistoryAndStatsEndpoint(t *testing.T) {
func TestServer_MessageHistoryMaxSize(t *testing.T) { func TestServer_MessageHistoryMaxSize(t *testing.T) {
forEachBackend(t, func(t *testing.T, databaseURL string) { forEachBackend(t, func(t *testing.T, databaseURL string) {
t.Parallel() // Do not run in parallel, we've seen race conditions with SQLite closing
s := newTestServer(t, newTestConfig(t, databaseURL)) s := newTestServer(t, newTestConfig(t, databaseURL))
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
s.messages = int64(i) s.updateAndWriteStats(int64(i))
s.execManager()
} }
require.Equal(t, []int64{10, 11, 12, 13, 14, 15, 16, 17, 18, 19}, s.messagesHistory) require.Equal(t, []int64{10, 11, 12, 13, 14, 15, 16, 17, 18, 19}, s.messagesHistory)
}) })
webpush/store_postgres.go
+4 -4
View File
@@ -72,7 +72,7 @@ const (
// NewPostgresStore creates a new PostgreSQL-backed web push store using an existing database connection pool. // NewPostgresStore creates a new PostgreSQL-backed web push store using an existing database connection pool.
func NewPostgresStore(db *sql.DB) (*Store, error) { func NewPostgresStore(db *sql.DB) (*Store, error) {
if err := setupPostgresDB(db); err != nil { if err := setupPostgres(db); err != nil {
return nil, err return nil, err
} }
return &Store{ return &Store{
@@ -95,11 +95,11 @@ func NewPostgresStore(db *sql.DB) (*Store, error) {
}, nil }, nil
} }
func setupPostgresDB(db *sql.DB) error { func setupPostgres(db *sql.DB) error {
var schemaVersion int var schemaVersion int
err := db.QueryRow(postgresSelectSchemaVersionQuery).Scan(&schemaVersion) err := db.QueryRow(postgresSelectSchemaVersionQuery).Scan(&schemaVersion)
if err != nil { if err != nil {
return setupNewPostgresDB(db) return setupNewPostgres(db)
} }
if schemaVersion > pgCurrentSchemaVersion { if schemaVersion > pgCurrentSchemaVersion {
return fmt.Errorf("unexpected schema version: version %d is higher than current version %d", schemaVersion, pgCurrentSchemaVersion) return fmt.Errorf("unexpected schema version: version %d is higher than current version %d", schemaVersion, pgCurrentSchemaVersion)
@@ -107,7 +107,7 @@ func setupPostgresDB(db *sql.DB) error {
return nil return nil
} }
func setupNewPostgresDB(db *sql.DB) error { func setupNewPostgres(db *sql.DB) error {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return err return err