From a0f781aeefc2ac5e491a8b9a5fce385b917ede17 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Tue, 31 Dec 2024 10:08:10 +0100 Subject: [PATCH] add a link to the upgrading docs in the error message Fixes #1854 Signed-off-by: Nicola Murino --- internal/dataprovider/bolt.go | 2 +- internal/dataprovider/dataprovider.go | 4 ++++ internal/dataprovider/mysql.go | 2 +- internal/dataprovider/pgsql.go | 2 +- internal/dataprovider/sqlite.go | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/dataprovider/bolt.go b/internal/dataprovider/bolt.go index 01ad0b3ed..53bf3234e 100644 --- a/internal/dataprovider/bolt.go +++ b/internal/dataprovider/bolt.go @@ -3135,7 +3135,7 @@ func (p *BoltProvider) migrateDatabase() error { providerLog(logger.LevelDebug, "bolt database is up to date, current version: %d", version) return ErrNoInitRequired case version < 28: - err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version) + err = errSchemaVersionTooOld(version) providerLog(logger.LevelError, "%v", err) logger.ErrorToConsole("%v", err) return err diff --git a/internal/dataprovider/dataprovider.go b/internal/dataprovider/dataprovider.go index 4b18babe8..44118e914 100644 --- a/internal/dataprovider/dataprovider.go +++ b/internal/dataprovider/dataprovider.go @@ -4631,6 +4631,10 @@ func checkReservedUsernames(username string) error { return nil } +func errSchemaVersionTooOld(version int) error { + return fmt.Errorf("database schema version %d is too old, please see the upgrading docs: https://docs.sftpgo.com/latest/data-provider/#upgrading", version) +} + func providerLog(level logger.LogLevel, format string, v ...any) { logger.Log(level, logSender, "", format, v...) } diff --git a/internal/dataprovider/mysql.go b/internal/dataprovider/mysql.go index 659637d99..271e2825d 100644 --- a/internal/dataprovider/mysql.go +++ b/internal/dataprovider/mysql.go @@ -794,7 +794,7 @@ func (p *MySQLProvider) migrateDatabase() error { providerLog(logger.LevelDebug, "sql database is up to date, current version: %d", version) return ErrNoInitRequired case version < 28: - err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version) + err = errSchemaVersionTooOld(version) providerLog(logger.LevelError, "%v", err) logger.ErrorToConsole("%v", err) return err diff --git a/internal/dataprovider/pgsql.go b/internal/dataprovider/pgsql.go index 3e7d69d2d..a215e61c9 100644 --- a/internal/dataprovider/pgsql.go +++ b/internal/dataprovider/pgsql.go @@ -819,7 +819,7 @@ func (p *PGSQLProvider) migrateDatabase() error { //nolint:dupl providerLog(logger.LevelDebug, "sql database is up to date, current version: %d", version) return ErrNoInitRequired case version < 28: - err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version) + err = errSchemaVersionTooOld(version) providerLog(logger.LevelError, "%v", err) logger.ErrorToConsole("%v", err) return err diff --git a/internal/dataprovider/sqlite.go b/internal/dataprovider/sqlite.go index 4a21c21c7..f49c71427 100644 --- a/internal/dataprovider/sqlite.go +++ b/internal/dataprovider/sqlite.go @@ -710,7 +710,7 @@ func (p *SQLiteProvider) migrateDatabase() error { //nolint:dupl providerLog(logger.LevelDebug, "sql database is up to date, current version: %d", version) return ErrNoInitRequired case version < 28: - err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version) + err = errSchemaVersionTooOld(version) providerLog(logger.LevelError, "%v", err) logger.ErrorToConsole("%v", err) return err