mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-19 01:21:00 +00:00
fix(database): stop noisy per-startup errors in the Postgres server log
Two statements failed server-side on every panel start after a SQLite to Postgres migration, flooding the postgres log even though the Go side suppressed them: - resyncPostgresSequences issued SELECT MAX(id) against client_inbounds, whose composite primary key has no id column; Postgres validates the SELECT list at parse time, so the WHERE pg_get_serial_sequence(...) guard never got a chance to no-op it. Skip models whose GORM schema maps no id column before issuing the statement. - AutoMigrate detects existing columns via information_schema filtered by table_catalog = CURRENT_DATABASE(), which misdetects on some setups and re-issues ALTER TABLE ... ADD for columns that already exist. HasColumn/ HasIndex query without that filter and are reliable (the existing duplicate-column suppressor depends on exactly that), so skip AutoMigrate outright when the table, every column, and every index already exist. Closes #5665
This commit is contained in:
@@ -0,0 +1,57 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||
)
|
||||
|
||||
// Locks the #5665 guard: composite-PK client_inbounds has no id column, so the
|
||||
// sequence-reset SQL must never be issued for it.
|
||||
func TestTableWithIdColumn_SkipsCompositeKeyModels(t *testing.T) {
|
||||
if err := InitDB(filepath.Join(t.TempDir(), "x-ui.db")); err != nil {
|
||||
t.Fatalf("InitDB: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _ = CloseDB() })
|
||||
|
||||
if table, ok := tableWithIdColumn(db, &model.ClientInbound{}); ok {
|
||||
t.Errorf("ClientInbound (table %q) has no id column but was not skipped", table)
|
||||
}
|
||||
table, ok := tableWithIdColumn(db, &model.Inbound{})
|
||||
if !ok {
|
||||
t.Fatal("Inbound has an id column but was reported as skippable")
|
||||
}
|
||||
if table != "inbounds" {
|
||||
t.Errorf("Inbound table = %q, want inbounds", table)
|
||||
}
|
||||
}
|
||||
|
||||
// Exercises the #5665 AutoMigrate skip on SQLite (the check is dialect-agnostic):
|
||||
// settled after InitDB, not settled with a missing column or table.
|
||||
func TestPostgresModelSettled_TracksSchemaPresence(t *testing.T) {
|
||||
if err := InitDB(filepath.Join(t.TempDir(), "x-ui.db")); err != nil {
|
||||
t.Fatalf("InitDB: %v", err)
|
||||
}
|
||||
t.Cleanup(func() { _ = CloseDB() })
|
||||
|
||||
for _, mdl := range []any{&model.ClientRecord{}, &model.ClientGroup{}, &model.ClientInbound{}} {
|
||||
if !postgresModelSettled(mdl) {
|
||||
t.Errorf("%T not settled right after InitDB", mdl)
|
||||
}
|
||||
}
|
||||
|
||||
if err := db.Migrator().DropColumn(&model.ClientGroup{}, "reset_up"); err != nil {
|
||||
t.Fatalf("drop column: %v", err)
|
||||
}
|
||||
if postgresModelSettled(&model.ClientGroup{}) {
|
||||
t.Error("ClientGroup settled despite missing reset_up column")
|
||||
}
|
||||
|
||||
if err := db.Migrator().DropTable(&model.ClientGroup{}); err != nil {
|
||||
t.Fatalf("drop table: %v", err)
|
||||
}
|
||||
if postgresModelSettled(&model.ClientGroup{}) {
|
||||
t.Error("ClientGroup settled despite missing table")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user