SQUASHME update db error names
This commit is contained in:
@@ -24,10 +24,10 @@ type DB struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrDatabaseNotInitialized = errors.New("database not initialized")
|
ErrNotInitialized = errors.New("database not initialized")
|
||||||
ErrDatabaseAlreadyInitialized = errors.New("database already initialized")
|
ErrAlreadyInitialized = errors.New("database already initialized")
|
||||||
ErrDatabaseSchemaOutdated = errors.New("database schema needs updating")
|
ErrSchemaOutdated = errors.New("database schema needs updating")
|
||||||
ErrDatabaseSchemaUnsupported = errors.New("database schema is too new for the server")
|
ErrSchemaUnsupported = errors.New("database schema is too new for the server")
|
||||||
ErrMigrationFailed = errors.New("migration failed")
|
ErrMigrationFailed = errors.New("migration failed")
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ func (db *DB) Close() error {
|
|||||||
func (db *DB) Initialize(schemaPath string) error {
|
func (db *DB) Initialize(schemaPath string) error {
|
||||||
err := db.CheckInitialized()
|
err := db.CheckInitialized()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return ErrDatabaseAlreadyInitialized
|
return ErrAlreadyInitialized
|
||||||
}
|
}
|
||||||
|
|
||||||
currentSchema := filepath.Join(schemaPath, "current.sql")
|
currentSchema := filepath.Join(schemaPath, "current.sql")
|
||||||
@@ -92,7 +92,7 @@ func (db *DB) CheckInitialized() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if count == 0 {
|
if count == 0 {
|
||||||
return ErrDatabaseNotInitialized
|
return ErrNotInitialized
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -128,9 +128,9 @@ func (db *DB) CheckSchemaVersion() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if version_ < version.SchemaVersion {
|
if version_ < version.SchemaVersion {
|
||||||
return ErrDatabaseSchemaOutdated
|
return ErrSchemaOutdated
|
||||||
} else if version_ > version.SchemaVersion {
|
} else if version_ > version.SchemaVersion {
|
||||||
return ErrDatabaseSchemaUnsupported
|
return ErrSchemaUnsupported
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user