Merge pull request #633 from heng4fun/master

Shlomi Noach · web-flow · commit 6a94f65b2fd6 · 2018-12-25T08:59:08.000+02:00
Support database with underscore
diff --git a/go/logic/inspect.go b/go/logic/inspect.go
@@ -232,6 +232,9 @@ func (this *Inspector) validateGrants() error {
 			if strings.Contains(grant, fmt.Sprintf("GRANT ALL PRIVILEGES ON `%s`.*", this.migrationContext.DatabaseName)) {
 				foundDBAll = true
 			}
+			if strings.Contains(grant, fmt.Sprintf("GRANT ALL PRIVILEGES ON `%s`.*", strings.Replace(this.migrationContext.DatabaseName, "_", "\\_", -1))) {
+				foundDBAll = true
+			}
 			if base.StringContainsAll(grant, `ALTER`, `CREATE`, `DELETE`, `DROP`, `INDEX`, `INSERT`, `LOCK TABLES`, `SELECT`, `TRIGGER`, `UPDATE`, ` ON *.*`) {
 				foundDBAll = true
 			}

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,9 @@ func (this *Inspector) validateGrants() error {`
`232`	`232`	if strings.Contains(grant, fmt.Sprintf("GRANT ALL PRIVILEGES ON `%s`.*", this.migrationContext.DatabaseName)) {
`233`	`233`	`foundDBAll = true`
`234`	`234`	`}`
	`235`	+ if strings.Contains(grant, fmt.Sprintf("GRANT ALL PRIVILEGES ON `%s`.*", strings.Replace(this.migrationContext.DatabaseName, "_", "\\_", -1))) {
	`236`	`+ foundDBAll = true`
	`237`	`+ }`
`235`	`238`	if base.StringContainsAll(grant, `ALTER`, `CREATE`, `DELETE`, `DROP`, `INDEX`, `INSERT`, `LOCK TABLES`, `SELECT`, `TRIGGER`, `UPDATE`, ` ON .`) {
`236`	`239`	`foundDBAll = true`
`237`	`240`	`}`