[#5607] rename aux.db to auxiliary.db

This commit is contained in:
Gani Georgiev
2024-10-06 16:41:05 +03:00
parent 292c34ee52
commit 0407de9cf5
7 changed files with 3649 additions and 3640 deletions
+2 -2
View File
@@ -157,10 +157,10 @@ type App interface {
// In a transaction the ConcurrentDB() and NonconcurrentDB() refer to the same *dbx.TX instance.
NonconcurrentDB() dbx.Builder
// AuxDB returns the default app auxiliary db instance (pb_data/aux.db).
// AuxDB returns the default app auxiliary db instance (pb_data/auxiliary.db).
AuxDB() dbx.Builder
// AuxNonconcurrentDB returns the nonconcurrent app auxiliary db instance (pb_data/aux.db)..
// AuxNonconcurrentDB returns the nonconcurrent app auxiliary db instance (pb_data/auxiliary.db)..
//
// The returned db instance is limited only to a single open connection,
// meaning that it can process only 1 db operation at a time (other operations will be queued up).
+5 -3
View File
@@ -481,12 +481,12 @@ func (app *BaseApp) NonconcurrentDB() dbx.Builder {
return app.nonconcurrentDB
}
// AuxDB returns the default app auxiliary db instance (pb_data/aux.db).
// AuxDB returns the default app auxiliary db instance (pb_data/auxiliary.db).
func (app *BaseApp) AuxDB() dbx.Builder {
return app.auxConcurrentDB
}
// AuxNonconcurrentDB returns the nonconcurrent app auxiliary db instance (pb_data/aux.db).
// AuxNonconcurrentDB returns the nonconcurrent app auxiliary db instance (pb_data/auxiliary.db).
//
// The returned db instance is limited only to a single open connection,
// meaning that it can process only 1 db operation at a time (other operations will be queued up).
@@ -1151,7 +1151,9 @@ func normalizeSQLLog(sql string) string {
}
func (app *BaseApp) initAuxDB() error {
dbPath := filepath.Join(app.DataDir(), "aux.db")
// note: renamed to "auxiliary" because "aux" is a reserved Windows filename
// (see https://github.com/pocketbase/pocketbase/issues/5607)
dbPath := filepath.Join(app.DataDir(), "auxiliary.db")
concurrentDB, err := app.config.DBConnect(dbPath)
if err != nil {
+3 -3
View File
@@ -128,9 +128,9 @@ func verifyBackupContent(app core.App, path string) error {
"data.db",
"data.db-shm",
"data.db-wal",
"aux.db",
"aux.db-shm",
"aux.db-wal",
"auxiliary.db",
"auxiliary.db-shm",
"auxiliary.db-wal",
".gitignore",
}