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

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

4
message/cache_postgres.go
View File

@@ -75,7 +75,7 @@ const (
postgresUpdateMessageTimeQuery = `UPDATE message SET time = $1 WHERE mid = $2`
)
var pgQueries = queries{
var postgresQueries = queries{
insertMessage: postgresInsertMessageQuery,
deleteMessage: postgresDeleteMessageQuery,
selectScheduledMessageIDsBySeqID: postgresSelectScheduledMessageIDsBySeqIDQuery,
@@ -106,5 +106,5 @@ func NewPostgresStore(db *sql.DB, batchSize int, batchTimeout time.Duration) (*C
if err := setupPostgres(db); err != nil {
return nil, err
}
return newCache(db, pgQueries, nil, batchSize, batchTimeout, false), nil
return newCache(db, postgresQueries, nil, batchSize, batchTimeout, false), nil
}

5
server/server_test.go
View File

@@ -2999,11 +2999,10 @@ func TestServer_MessageHistoryAndStatsEndpoint(t *testing.T) {
func TestServer_MessageHistoryMaxSize(t *testing.T) {
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))
for i := 0; i < 20; i++ {
s.messages = int64(i)
s.execManager()
s.updateAndWriteStats(int64(i))
}
require.Equal(t, []int64{10, 11, 12, 13, 14, 15, 16, 17, 18, 19}, s.messagesHistory)
})

8
webpush/store_postgres.go
View File

@@ -72,7 +72,7 @@ const (
// NewPostgresStore creates a new PostgreSQL-backed web push store using an existing database connection pool.
func NewPostgresStore(db *sql.DB) (*Store, error) {
if err := setupPostgresDB(db); err != nil {
if err := setupPostgres(db); err != nil {
return nil, err
}
return &Store{
@@ -95,11 +95,11 @@ func NewPostgresStore(db *sql.DB) (*Store, error) {
}, nil
}
func setupPostgresDB(db *sql.DB) error {
func setupPostgres(db *sql.DB) error {
var schemaVersion int
err := db.QueryRow(postgresSelectSchemaVersionQuery).Scan(&schemaVersion)
if err != nil {
return setupNewPostgresDB(db)
return setupNewPostgres(db)
}
if 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
}
func setupNewPostgresDB(db *sql.DB) error {
func setupNewPostgres(db *sql.DB) error {
tx, err := db.Begin()
if err != nil {
return err