Skip to content

Commit

Permalink
Move mysql/postgres custom options to beginning
Browse files Browse the repository at this point in the history 
Related webdevops/clitools#116
  • Loading branch information
@mblaschke
mblaschke committed Nov 2, 2017
1 parent d8f628e commit 0833193
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 33 deletions.
28 changes: 17 additions & 11 deletions sync/database_mysql_local.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ func (database *DatabaseMysql) localMysqldumpCmdBuilder(additionalArgs []string,

connection := database.Local.Connection.GetInstance().Clone()

// add custom options (raw)
if database.Local.Options.Mysqldump != "" {
args = append(args, database.Local.Options.Mysqldump)
}

if database.Local.User != "" {
args = append(args, shell.Quote("-u" + database.Local.User))
}
Expand All @@ -35,11 +40,6 @@ func (database *DatabaseMysql) localMysqldumpCmdBuilder(additionalArgs []string,
args = append(args, excludeArgs...)
}

// add custom options (raw)
if database.Local.Options.Mysqldump != "" {
args = append(args, database.Local.Options.Mysqldump)
}

// database
args = append(args, shell.Quote(database.Local.Db))

Expand All @@ -51,9 +51,16 @@ func (database *DatabaseMysql) localMysqldumpCmdBuilder(additionalArgs []string,
return connection.RawCommandBuilder("mysqldump", args...)
}

func (database *DatabaseMysql) localMysqlCmdBuilder(args ...string) []interface{} {
func (database *DatabaseMysql) localMysqlCmdBuilder(additonalArgs ...string) []interface{} {
var args []string

connection := database.Local.Connection.GetInstance().Clone()

// add custom options (raw)
if database.Local.Options.Mysql != "" {
args = append(args, database.Local.Options.Mysql)
}

args = append(args, "-BN")

if database.Local.User != "" {
Expand All @@ -72,15 +79,14 @@ func (database *DatabaseMysql) localMysqlCmdBuilder(args ...string) []interface{
args = append(args, shell.Quote("-P" + database.Local.Port))
}

// add custom options (raw)
if database.Local.Options.Mysql != "" {
args = append(args, database.Local.Options.Mysql)
}

if database.Local.Db != "" {
args = append(args, shell.Quote(database.Local.Db))
}

if len(additonalArgs) > 0 {
args = append(args, additonalArgs...)
}

return connection.RawCommandBuilder("mysql", args...)
}

28 changes: 20 additions & 8 deletions sync/database_mysql_remote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,16 @@ func (database *DatabaseMysql) remoteMysqldumpCmdBuilder(additionalArgs []string
return connection.RawShellCommandBuilder(cmd...)
}

func (database *DatabaseMysql) remoteMysqlCmdBuilder(args ...string) []interface{} {
func (database *DatabaseMysql) remoteMysqlCmdBuilder(additonalArgs ...string) []interface{} {
var args []string

connection := database.Connection.GetInstance().Clone()

// append options in raw
if database.Options.Mysql != "" {
args = append(args, database.Options.Mysql)
}

args = append(args, "-BN")

if database.User != "" {
Expand All @@ -82,18 +89,24 @@ func (database *DatabaseMysql) remoteMysqlCmdBuilder(args ...string) []interface
args = append(args, shell.Quote(database.Db))
}

// append options in raw
if database.Options.Mysql != "" {
args = append(args, database.Options.Mysql)
if len(additonalArgs) > 0 {
args = append(args, additonalArgs...)
}

return connection.RawCommandBuilder("mysql", args...)
}


func (database *DatabaseMysql) remoteMysqlCmdBuilderUncompress(args ...string) []interface{} {
func (database *DatabaseMysql) remoteMysqlCmdBuilderUncompress(additonalArgs ...string) []interface{} {
var args []string

connection := database.Connection.GetInstance().Clone()

// add custom options (raw)
if database.Options.Mysql != "" {
args = append(args, database.Options.Mysql)
}

args = append(args, "-BN")

if database.User != "" {
Expand All @@ -112,9 +125,8 @@ func (database *DatabaseMysql) remoteMysqlCmdBuilderUncompress(args ...string) [
args = append(args, shell.Quote("-P" + database.Port))
}

// add custom options (raw)
if database.Options.Mysql != "" {
args = append(args, database.Options.Mysql)
if len(additonalArgs) > 0 {
args = append(args, additonalArgs...)
}

if database.Db != "" {
Expand Down
28 changes: 18 additions & 10 deletions sync/database_postgres_local.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@ package sync
import "github.com/webdevops/go-shell"

func (database *DatabasePostgres) localPgdumpCmdBuilder(additionalArgs []string, useFilter bool) []interface{} {
connection := database.Local.Connection.GetInstance().Clone()
var args []string

connection := database.Local.Connection.GetInstance().Clone()

// add custom options (raw)
if database.Local.Options.Pgdump != "" {
args = append(args, database.Local.Options.Pgdump)
}

if database.Local.User != "" {
args = append(args, "-U", shell.Quote(database.Local.User))
}
Expand All @@ -32,11 +38,6 @@ func (database *DatabasePostgres) localPgdumpCmdBuilder(additionalArgs []string,
args = append(args, excludeArgs...)
}

// add custom options (raw)
if database.Local.Options.Pgdump != "" {
args = append(args, database.Local.Options.Pgdump)
}

// database
args = append(args, shell.Quote(database.Local.Db))

Expand All @@ -48,8 +49,16 @@ func (database *DatabasePostgres) localPgdumpCmdBuilder(additionalArgs []string,
return connection.RawCommandBuilder("pg_dump", args...)
}

func (database *DatabasePostgres) localPsqlCmdBuilder(args ...string) []interface{} {
func (database *DatabasePostgres) localPsqlCmdBuilder(additonalArgs ...string) []interface{} {
var args []string

connection := database.Local.Connection.GetInstance().Clone()

// add custom options (raw)
if database.Local.Options.Psql != "" {
args = append(args, database.Local.Options.Psql)
}

args = append(args, "-t")

if database.Local.User != "" {
Expand All @@ -68,9 +77,8 @@ func (database *DatabasePostgres) localPsqlCmdBuilder(args ...string) []interfac
args = append(args, "-p", shell.Quote(database.Local.Port))
}

// add custom options (raw)
if database.Local.Options.Psql != "" {
args = append(args, database.Local.Options.Psql)
if len(additonalArgs) > 0 {
args = append(args, additonalArgs...)
}

if database.Local.Db != "" {
Expand Down
15 changes: 11 additions & 4 deletions sync/database_postgres_remote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,16 @@ func (database *DatabasePostgres) remotePgdumpCmdBuilder(additionalArgs []string
return connection.RawShellCommandBuilder(cmd...)
}

func (database *DatabasePostgres) remotePsqlCmdBuilder(args ...string) []interface{} {
func (database *DatabasePostgres) remotePsqlCmdBuilder(additonalArgs ...string) []interface{} {
var args []string

connection := database.Connection.GetInstance().Clone()

// append options in raw
if database.Options.Psql != "" {
args = append(args, database.Options.Psql)
}

args = append(args, "-t")

if database.User != "" {
Expand All @@ -80,9 +88,8 @@ func (database *DatabasePostgres) remotePsqlCmdBuilder(args ...string) []interfa
args = append(args, shell.Quote(database.Db))
}

// append options in raw
if database.Options.Psql != "" {
args = append(args, database.Options.Psql)
if len(additonalArgs) > 0 {
args = append(args, additonalArgs...)
}

return connection.RawCommandBuilder("psql", args...)
Expand Down

0 comments on commit 0833193

Please sign in to comment.