octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
Tim Vaillancourt 2022-12-11 19:26:14 +01:00
parent 70682b1c35
commit 48f7467a3c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
go/base/utils.go
View File

@ -61,11 +61,10 @@ func StringContainsAll(s string, substrings ...string) bool {
return nonEmptyStringsFound
}
func ValidateConnection(db *gosql.DB, connectionConfig *mysql.ConnectionConfig, migrationContext *MigrationContext, name string) (string, error) {
func ValidateConnection(db *gosql.DB, connectionConfig *mysql.ConnectionConfig, migrationContext *MigrationContext, name string) (version string, err error) {
query := `select @@global.version, @@global.port`
var version string
var port gosql.NullInt64
if err := db.QueryRow(query).Scan(&version, &port); err != nil {
if err = db.QueryRow(query).Scan(&version, &port); err != nil {
return "", err
}
@ -79,7 +78,7 @@ func ValidateConnection(db *gosql.DB, connectionConfig *mysql.ConnectionConfig,
// Azure MySQL set users port to a different value by design, replace it by gh-ost param
if migrationContext.AliyunRDS || migrationContext.GoogleCloudPlatform || migrationContext.AzureMySQL {
port.Int64 = connectionConfig.Key.Port
port.Valid = true
port.Valid = connectionConfig.Key.Port > 0
}
if !port.Valid || extraPort == 0 {
@ -89,5 +88,5 @@ func ValidateConnection(db *gosql.DB, connectionConfig *mysql.ConnectionConfig,
}
migrationContext.Log.Infof("%s connection validated on %+v", name, connectionConfig.Key)
return version, nil
return version, err
}