Skip to content

Commit 232268d

Browse files
mblaschkemblaschke
committed
Switch schema to database
1 parent 54faf5d commit 232268d

11 files changed

+82
-82
lines changed

‎examples/gosync.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ sync:
4343
database:
4444

4545
## NORMAL MYSQL
46-
## Sync schema typo3 to local test-local (without cache tables)
46+
## Sync database typo3 to local test-local (without cache tables)
4747
##
4848
## remote: connect via ssh and get dump from local installed mysql
4949
## local: connect via mysql to a database server "mysql.example.com"
5050
- type: mysql
51-
schema: application1
51+
database: application1
5252
user: mysql-user
5353
password: mysql-password
5454
filter:
@@ -57,7 +57,7 @@ sync:
5757
include:
5858
local:
5959
## use plain mysql connection
60-
schema: test-application1
60+
database: test-application1
6161
user: root
6262
password: dev
6363
port: 13306
@@ -77,19 +77,19 @@ sync:
7777
mysql:
7878

7979
## DOCKER
80-
## Sync schema typo3 to local test-local into a docker container
80+
## Sync database typo3 to local test-local into a docker container
8181
##
8282
## remote: connect via ssh and get dump from local installed mysql
8383
## local: use docker container "2713f9093bed" for restore
8484
- type: mysql
85-
schema: application2
85+
database: application2
8686
user: mysql-user
8787
password: mysql-password
8888
filter:
8989
exclude:
9090
include:
9191
local:
92-
schema: test-application2
92+
database: test-application2
9393
user: root
9494
password: dev
9595
connection:
@@ -100,21 +100,21 @@ sync:
100100
clear-database: true
101101

102102
## DOCKER-COMPOSE
103-
## Sync schema typo3 to local test-local into a docker-compose container
103+
## Sync database typo3 to local test-local into a docker-compose container
104104
##
105105
## docker-compose.yml has to be in the same or parent directory!
106106
##
107107
## remote: connect via ssh and get dump from local installed mysql
108108
## local: use docker-compose container "mysql" for restore
109109
- type: mysql
110-
schema: application3
110+
database: application3
111111
user: mysql-user
112112
password: mysql-password
113113
filter:
114114
exclude:
115115
include:
116116
local:
117-
schema: test-application3
117+
database: test-application3
118118
user: root
119119
password: dev
120120
connection:
@@ -190,14 +190,14 @@ deploy:
190190

191191
database:
192192
- type: mysql
193-
schema: foobar
193+
database: foobar
194194
user: mysql-user
195195
password: mysql-password
196196
filter:
197197
exclude:
198198
include:
199199
local:
200-
schema: test
200+
database: test
201201
user: root
202202
password: dev
203203
connection:

‎sync/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type EnvironmentVar struct {
3939

4040
type Database struct {
4141
Type string `yaml:"type"`
42-
Schema string `yaml:"schema"`
42+
Db string `yaml:"database"`
4343
Hostname string `yaml:"hostname"`
4444
Port string `yaml:"port"`
4545
User string `yaml:"user"`
@@ -51,7 +51,7 @@ type Database struct {
5151

5252
Local struct {
5353
Type string `yaml:"type"`
54-
Schema string `yaml:"schema"`
54+
Db string `yaml:"database"`
5555
Hostname string `yaml:"hostname"`
5656
Port string `yaml:"port"`
5757
User string `yaml:"user"`

‎sync/database.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (database *Database) String(direction string) string {
5050

5151
//-------------------------------------------
5252
// remote
53-
remote = append(remote, fmt.Sprintf("Schema:%s", database.Schema))
53+
remote = append(remote, fmt.Sprintf("Database:%s", database.Db))
5454
remote = append(remote, fmt.Sprintf("Connection:%s", connRemote.GetType()))
5555

5656
if connRemote.IsSsh() {
@@ -80,7 +80,7 @@ func (database *Database) String(direction string) string {
8080

8181
//-------------------------------------------
8282
// local
83-
local = append(local, fmt.Sprintf("Schema:%s", database.Local.Schema))
83+
local = append(local, fmt.Sprintf("Database:%s", database.Local.Db))
8484
local = append(local, fmt.Sprintf("Connection:%s", connLocal.GetType()))
8585

8686
if connLocal.IsSsh() {

‎sync/database_mysql.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func (database *DatabaseMysql) init() {
1616

1717
// LOCAL
1818
if connLocal.IsDocker() {
19-
if database.Local.User == "" || database.Local.Schema == "" {
19+
if database.Local.User == "" || database.Local.Db == "" {
2020
containerEnv := connLocal.DockerGetEnvironment()
2121

2222
// try to guess user/password
@@ -46,19 +46,19 @@ func (database *DatabaseMysql) init() {
4646
}
4747
}
4848

49-
// get schema from env
50-
if database.Local.Schema == "" {
51-
if schema, ok := containerEnv["MYSQL_DATABASE"]; ok {
52-
fmt.Println(fmt.Sprintf(" -> local: using mysql schema \"%s\" (from env:MYSQL_DATABASE)", schema))
53-
database.Local.Schema = schema
49+
// get database from env
50+
if database.Local.Db == "" {
51+
if db, ok := containerEnv["MYSQL_DATABASE"]; ok {
52+
fmt.Println(fmt.Sprintf(" -> local: using mysql database \"%s\" (from env:MYSQL_DATABASE)", db))
53+
database.Local.Db = db
5454
}
5555
}
5656
}
5757
}
5858

5959
// Remote
6060
if connRemote.IsDocker() {
61-
if database.User == "" || database.Schema == "" {
61+
if database.User == "" || database.Db == "" {
6262
containerEnv := connRemote.DockerGetEnvironment()
6363

6464
// try to guess user/password
@@ -88,11 +88,11 @@ func (database *DatabaseMysql) init() {
8888
}
8989
}
9090

91-
// get schema from env
92-
if database.Schema == "" {
93-
if schema, ok := containerEnv["MYSQL_DATABASE"]; ok {
94-
fmt.Println(fmt.Sprintf(" -> remote: using mysql schema \"%s\" (from env:MYSQL_DATABASE)", schema))
95-
database.Schema = schema
91+
// get database from env
92+
if database.Db == "" {
93+
if db, ok := containerEnv["MYSQL_DATABASE"]; ok {
94+
fmt.Println(fmt.Sprintf(" -> remote: using mysql database \"%s\" (from env:MYSQL_DATABASE)", db))
95+
database.Db = db
9696
}
9797
}
9898
}
@@ -122,7 +122,7 @@ func (database *DatabaseMysql) tableFilter(connectionType string) (exclude []str
122122
// calc excludes
123123
excludeTableList := database.Filter.CalcExcludes(tableList)
124124
for _, table := range excludeTableList {
125-
exclude = append(exclude, shell.Quote(fmt.Sprintf("--ignore-table=%s.%s", database.Schema, table)))
125+
exclude = append(exclude, shell.Quote(fmt.Sprintf("--ignore-table=%s.%s", database.Db, table)))
126126
}
127127

128128
// calc includes

‎sync/database_mysql_local.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func (database *DatabaseMysql) localMysqldumpCmdBuilder(additionalArgs []string,
4040
args = append(args, database.Local.Options.Mysqldump)
4141
}
4242

43-
// schema
44-
args = append(args, shell.Quote(database.Local.Schema))
43+
// database
44+
args = append(args, shell.Quote(database.Local.Db))
4545

4646
// include
4747
if useFilter && len(includeArgs) > 0 {
@@ -77,8 +77,8 @@ func (database *DatabaseMysql) localMysqlCmdBuilder(args ...string) []interface{
7777
args = append(args, database.Local.Options.Mysql)
7878
}
7979

80-
if database.Local.Schema != "" {
81-
args = append(args, shell.Quote(database.Local.Schema))
80+
if database.Local.Db != "" {
81+
args = append(args, shell.Quote(database.Local.Db))
8282
}
8383

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

‎sync/database_mysql_remote.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func (database *DatabaseMysql) remoteMysqldumpCmdBuilder(additionalArgs []string
3636
args = append(args, excludeArgs...)
3737
}
3838

39-
// schema
40-
args = append(args, shell.Quote(database.Schema))
39+
// database
40+
args = append(args, shell.Quote(database.Db))
4141

4242
// include
4343
if useFilter && len(includeArgs) > 0 {
@@ -78,8 +78,8 @@ func (database *DatabaseMysql) remoteMysqlCmdBuilder(args ...string) []interface
7878
args = append(args, shell.Quote("-P" + database.Port))
7979
}
8080

81-
if database.Schema != "" {
82-
args = append(args, shell.Quote(database.Schema))
81+
if database.Db != "" {
82+
args = append(args, shell.Quote(database.Db))
8383
}
8484

8585
// append options in raw
@@ -117,8 +117,8 @@ func (database *DatabaseMysql) remoteMysqlCmdBuilderUncompress(args ...string) [
117117
args = append(args, database.Options.Mysql)
118118
}
119119

120-
if database.Schema != "" {
121-
args = append(args, shell.Quote(database.Schema))
120+
if database.Db != "" {
121+
args = append(args, shell.Quote(database.Db))
122122
}
123123

124124
cmd := []string{"gunzip", "--stdout", "|", "mysql", strings.Join(args, " ")}

‎sync/database_postgres.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func (database *DatabasePostgres) init() {
1616

1717
// LOCAL
1818
if connLocal.IsDocker() {
19-
if database.Local.User == "" || database.Local.Schema == "" {
19+
if database.Local.User == "" || database.Local.Db == "" {
2020
containerEnv := connLocal.DockerGetEnvironment()
2121

2222
// try to guess user/password
@@ -36,19 +36,19 @@ func (database *DatabasePostgres) init() {
3636
}
3737
}
3838

39-
// get schema from env
40-
if database.Local.Schema == "" {
41-
if schema, ok := containerEnv["POSTGRES_DB"]; ok {
42-
fmt.Println(fmt.Sprintf(" -> remote: using postgres schema \"%s\" (from env:POSTGRES_DB)", schema))
43-
database.Local.Schema = schema
39+
// get database from env
40+
if database.Local.Db == "" {
41+
if db, ok := containerEnv["POSTGRES_DB"]; ok {
42+
fmt.Println(fmt.Sprintf(" -> remote: using postgres database \"%s\" (from env:POSTGRES_DB)", db))
43+
database.Local.Db = db
4444
}
4545
}
4646
}
4747
}
4848

4949
// Remote
5050
if connRemote.IsDocker() {
51-
if database.User == "" || database.Schema == "" {
51+
if database.User == "" || database.Db == "" {
5252
containerEnv := connRemote.DockerGetEnvironment()
5353

5454
// try to guess user/password
@@ -68,11 +68,11 @@ func (database *DatabasePostgres) init() {
6868
}
6969
}
7070

71-
// get schema from env
72-
if database.Schema == "" {
73-
if schema, ok := containerEnv["POSTGRES_DB"]; ok {
74-
fmt.Println(fmt.Sprintf(" -> remote: using postgres schema \"%s\" (from env:POSTGRES_DB)", schema))
75-
database.Schema = schema
71+
// get database from env
72+
if database.Db == "" {
73+
if db, ok := containerEnv["POSTGRES_DB"]; ok {
74+
fmt.Println(fmt.Sprintf(" -> remote: using postgres database \"%s\" (from env:POSTGRES_DB)", db))
75+
database.Db = db
7676
}
7777
}
7878
}
@@ -126,7 +126,7 @@ func (database *DatabasePostgres) tableList(connectionType string) []string {
126126
FROM information_schema.tables
127127
WHERE table_type = 'BASE TABLE'
128128
AND table_catalog = %s`
129-
sqlStmt = fmt.Sprintf(sqlStmt, database.quote(database.Schema))
129+
sqlStmt = fmt.Sprintf(sqlStmt, database.quote(database.Db))
130130

131131
cmd := shell.Cmd("echo", shell.Quote(sqlStmt)).Pipe(database.psqlCommandBuilder(connectionType)...)
132132
output := cmd.Run().Stdout.String()

‎sync/database_postgres_local.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ func (database *DatabasePostgres) localPgdumpCmdBuilder(additionalArgs []string,
3737
args = append(args, database.Local.Options.Pgdump)
3838
}
3939

40-
// schema
41-
args = append(args, shell.Quote(database.Local.Schema))
40+
// database
41+
args = append(args, shell.Quote(database.Local.Db))
4242

4343
// include
4444
if useFilter && len(includeArgs) > 0 {
@@ -73,8 +73,8 @@ func (database *DatabasePostgres) localPsqlCmdBuilder(args ...string) []interfac
7373
args = append(args, database.Local.Options.Psql)
7474
}
7575

76-
if database.Local.Schema != "" {
77-
args = append(args, shell.Quote(database.Local.Schema))
76+
if database.Local.Db != "" {
77+
args = append(args, shell.Quote(database.Local.Db))
7878
}
7979

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

‎sync/database_postgres_remote.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func (database *DatabasePostgres) remotePgdumpCmdBuilder(additionalArgs []string
3535
args = append(args, excludeArgs...)
3636
}
3737

38-
// schema
39-
args = append(args, shell.Quote(database.Schema))
38+
// database
39+
args = append(args, shell.Quote(database.Db))
4040

4141
// include
4242
if useFilter && len(includeArgs) > 0 {
@@ -76,8 +76,8 @@ func (database *DatabasePostgres) remotePsqlCmdBuilder(args ...string) []interfa
7676
args = append(args, "-p", shell.Quote(database.Port))
7777
}
7878

79-
if database.Schema != "" {
80-
args = append(args, shell.Quote(database.Schema))
79+
if database.Db != "" {
80+
args = append(args, shell.Quote(database.Db))
8181
}
8282

8383
// append options in raw
@@ -114,8 +114,8 @@ func (database *DatabasePostgres) remotePsqlCmdBuilderUncompress(args ...string)
114114
args = append(args, database.Options.Psql)
115115
}
116116

117-
if database.Schema != "" {
118-
args = append(args, shell.Quote(database.Schema))
117+
if database.Db != "" {
118+
args = append(args, shell.Quote(database.Db))
119119
}
120120

121121
cmd := []string{"gunzip", "--stdout", "|", "psql", strings.Join(args, " ")}

‎sync/server_deploy_database.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ func (database *Database) Deploy() {
2626
func (database *DatabaseMysql) deployClearDatabase() {
2727

2828
// don't use database which we're trying to drop, instead use "mysql"
29-
schema := database.Schema
30-
database.Schema = ""
29+
db := database.Db
30+
database.Db = ""
3131

32-
Logger.Step("dropping remote database \"%s\"", schema)
33-
dropStmt := fmt.Sprintf("DROP DATABASE IF EXISTS `%s`", schema)
32+
Logger.Step("dropping remote database \"%s\"", db)
33+
dropStmt := fmt.Sprintf("DROP DATABASE IF EXISTS `%s`", db)
3434
dropCmd := shell.Cmd("echo", shell.Quote(dropStmt)).Pipe(database.remoteMysqlCmdBuilder()...)
3535
dropCmd.Run()
3636

37-
Logger.Step("creating remote database \"%s\"", schema)
38-
createStmt := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s`", schema)
37+
Logger.Step("creating remote database \"%s\"", db)
38+
createStmt := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s`", db)
3939
createCmd := shell.Cmd("echo", shell.Quote(createStmt)).Pipe(database.remoteMysqlCmdBuilder()...)
4040
createCmd.Run()
4141

42-
database.Schema = schema
42+
database.Db = db
4343
}
4444

4545
// Deploy database structure

0 commit comments

Comments
 (0)