Skip to content

Commit 0833193

Browse files
mblaschkemblaschke
committed
Move mysql/postgres custom options to beginning
Related webdevops/clitools#116
1 parent d8f628e commit 0833193

File tree

4 files changed

+66
-33
lines changed

4 files changed

+66
-33
lines changed

‎sync/database_mysql_local.go‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ func (database *DatabaseMysql) localMysqldumpCmdBuilder(additionalArgs []string,
99

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

12+
// add custom options (raw)
13+
if database.Local.Options.Mysqldump != "" {
14+
args = append(args, database.Local.Options.Mysqldump)
15+
}
16+
1217
if database.Local.User != "" {
1318
args = append(args, shell.Quote("-u" + database.Local.User))
1419
}
@@ -35,11 +40,6 @@ func (database *DatabaseMysql) localMysqldumpCmdBuilder(additionalArgs []string,
3540
args = append(args, excludeArgs...)
3641
}
3742

38-
// add custom options (raw)
39-
if database.Local.Options.Mysqldump != "" {
40-
args = append(args, database.Local.Options.Mysqldump)
41-
}
42-
4343
// database
4444
args = append(args, shell.Quote(database.Local.Db))
4545

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

54-
func (database *DatabaseMysql) localMysqlCmdBuilder(args ...string) []interface{} {
54+
func (database *DatabaseMysql) localMysqlCmdBuilder(additonalArgs ...string) []interface{} {
55+
var args []string
56+
5557
connection := database.Local.Connection.GetInstance().Clone()
5658

59+
// add custom options (raw)
60+
if database.Local.Options.Mysql != "" {
61+
args = append(args, database.Local.Options.Mysql)
62+
}
63+
5764
args = append(args, "-BN")
5865

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

75-
// add custom options (raw)
76-
if database.Local.Options.Mysql != "" {
77-
args = append(args, database.Local.Options.Mysql)
78-
}
79-
8082
if database.Local.Db != "" {
8183
args = append(args, shell.Quote(database.Local.Db))
8284
}
8385

86+
if len(additonalArgs) > 0 {
87+
args = append(args, additonalArgs...)
88+
}
89+
8490
return connection.RawCommandBuilder("mysql", args...)
8591
}
8692

‎sync/database_mysql_remote.go‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,16 @@ func (database *DatabaseMysql) remoteMysqldumpCmdBuilder(additionalArgs []string
5757
return connection.RawShellCommandBuilder(cmd...)
5858
}
5959

60-
func (database *DatabaseMysql) remoteMysqlCmdBuilder(args ...string) []interface{} {
60+
func (database *DatabaseMysql) remoteMysqlCmdBuilder(additonalArgs ...string) []interface{} {
61+
var args []string
62+
6163
connection := database.Connection.GetInstance().Clone()
6264

65+
// append options in raw
66+
if database.Options.Mysql != "" {
67+
args = append(args, database.Options.Mysql)
68+
}
69+
6370
args = append(args, "-BN")
6471

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

85-
// append options in raw
86-
if database.Options.Mysql != "" {
87-
args = append(args, database.Options.Mysql)
92+
if len(additonalArgs) > 0 {
93+
args = append(args, additonalArgs...)
8894
}
8995

9096
return connection.RawCommandBuilder("mysql", args...)
9197
}
9298

9399

94-
func (database *DatabaseMysql) remoteMysqlCmdBuilderUncompress(args ...string) []interface{} {
100+
func (database *DatabaseMysql) remoteMysqlCmdBuilderUncompress(additonalArgs ...string) []interface{} {
101+
var args []string
102+
95103
connection := database.Connection.GetInstance().Clone()
96104

105+
// add custom options (raw)
106+
if database.Options.Mysql != "" {
107+
args = append(args, database.Options.Mysql)
108+
}
109+
97110
args = append(args, "-BN")
98111

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

115-
// add custom options (raw)
116-
if database.Options.Mysql != "" {
117-
args = append(args, database.Options.Mysql)
128+
if len(additonalArgs) > 0 {
129+
args = append(args, additonalArgs...)
118130
}
119131

120132
if database.Db != "" {

‎sync/database_postgres_local.go‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ package sync
33
import "github.com/webdevops/go-shell"
44

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

8+
connection := database.Local.Connection.GetInstance().Clone()
9+
10+
// add custom options (raw)
11+
if database.Local.Options.Pgdump != "" {
12+
args = append(args, database.Local.Options.Pgdump)
13+
}
14+
915
if database.Local.User != "" {
1016
args = append(args, "-U", shell.Quote(database.Local.User))
1117
}
@@ -32,11 +38,6 @@ func (database *DatabasePostgres) localPgdumpCmdBuilder(additionalArgs []string,
3238
args = append(args, excludeArgs...)
3339
}
3440

35-
// add custom options (raw)
36-
if database.Local.Options.Pgdump != "" {
37-
args = append(args, database.Local.Options.Pgdump)
38-
}
39-
4041
// database
4142
args = append(args, shell.Quote(database.Local.Db))
4243

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

51-
func (database *DatabasePostgres) localPsqlCmdBuilder(args ...string) []interface{} {
52+
func (database *DatabasePostgres) localPsqlCmdBuilder(additonalArgs ...string) []interface{} {
53+
var args []string
54+
5255
connection := database.Local.Connection.GetInstance().Clone()
56+
57+
// add custom options (raw)
58+
if database.Local.Options.Psql != "" {
59+
args = append(args, database.Local.Options.Psql)
60+
}
61+
5362
args = append(args, "-t")
5463

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

71-
// add custom options (raw)
72-
if database.Local.Options.Psql != "" {
73-
args = append(args, database.Local.Options.Psql)
80+
if len(additonalArgs) > 0 {
81+
args = append(args, additonalArgs...)
7482
}
7583

7684
if database.Local.Db != "" {

‎sync/database_postgres_remote.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,16 @@ func (database *DatabasePostgres) remotePgdumpCmdBuilder(additionalArgs []string
5656
return connection.RawShellCommandBuilder(cmd...)
5757
}
5858

59-
func (database *DatabasePostgres) remotePsqlCmdBuilder(args ...string) []interface{} {
59+
func (database *DatabasePostgres) remotePsqlCmdBuilder(additonalArgs ...string) []interface{} {
60+
var args []string
61+
6062
connection := database.Connection.GetInstance().Clone()
63+
64+
// append options in raw
65+
if database.Options.Psql != "" {
66+
args = append(args, database.Options.Psql)
67+
}
68+
6169
args = append(args, "-t")
6270

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

83-
// append options in raw
84-
if database.Options.Psql != "" {
85-
args = append(args, database.Options.Psql)
91+
if len(additonalArgs) > 0 {
92+
args = append(args, additonalArgs...)
8693
}
8794

8895
return connection.RawCommandBuilder("psql", args...)

0 commit comments

Comments
 (0)