go/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-05 22:17:20 +02:00
Code Issues Releases Activity

fix initprovider exit code for MySQL and PostgreSQL

Browse Source
This commit is contained in:
Nicola Murino
2020-08-30 14:00:45 +02:00
parent 600a107699
commit 91a4c64390
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dataprovider/mysql.go
View File

@@ -172,6 +172,10 @@ func (p MySQLProvider) reloadConfig() error {
// initializeDatabase creates the initial database structure // initializeDatabase creates the initial database structure
func (p MySQLProvider) initializeDatabase() error { func (p MySQLProvider) initializeDatabase() error {
dbVersion, err := sqlCommonGetDatabaseVersion(p.dbHandle, false)
if err == nil && dbVersion.Version > 0 {
return ErrNoInitRequired
}
sqlUsers := strings.Replace(mysqlUsersTableSQL, "{{users}}", sqlTableUsers, 1) sqlUsers := strings.Replace(mysqlUsersTableSQL, "{{users}}", sqlTableUsers, 1)
tx, err := p.dbHandle.Begin() tx, err := p.dbHandle.Begin()
if err != nil { if err != nil {

4
dataprovider/pgsql.go
View File

@@ -171,6 +171,10 @@ func (p PGSQLProvider) reloadConfig() error {
// initializeDatabase creates the initial database structure // initializeDatabase creates the initial database structure
func (p PGSQLProvider) initializeDatabase() error { func (p PGSQLProvider) initializeDatabase() error {
dbVersion, err := sqlCommonGetDatabaseVersion(p.dbHandle, false)
if err == nil && dbVersion.Version > 0 {
return ErrNoInitRequired
}
sqlUsers := strings.Replace(pgsqlUsersTableSQL, "{{users}}", sqlTableUsers, 1) sqlUsers := strings.Replace(pgsqlUsersTableSQL, "{{users}}", sqlTableUsers, 1)
tx, err := p.dbHandle.Begin() tx, err := p.dbHandle.Begin()
if err != nil { if err != nil {