Readd deleted database / table wrapping

Peter Junos · Peter Junos · commit 6aa86abdf305 · 2022-06-06T15:13:34.000+02:00
diff --git a/mysql/resource_grant.go b/mysql/resource_grant.go
@@ -214,8 +214,11 @@ func CreateGrant(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
+	// DB and table have to be wrappedsin backticks in some cases.
+	databaseWrapped := formatDatabaseName(database)
+	tableWrapped := formatTableName(table)
 	if (!isRole || hasPrivs) && rolesGranted == 0 {
-		grantOn = fmt.Sprintf(" ON %s.%s", database, table)
+		grantOn = fmt.Sprintf(" ON %s.%s", databaseWrapped, tableWrapped)
 	}
 
 	stmtSQL := fmt.Sprintf("GRANT %s%s TO %s",
@@ -242,9 +245,9 @@ func CreateGrant(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("Error running SQL (%s): %s", stmtSQL, err)
 	}
 
-	id := fmt.Sprintf("%s@%s:%s", user, host, database)
+	id := fmt.Sprintf("%s@%s:%s", user, host, databaseWrapped)
 	if isRole {
-		id = fmt.Sprintf("%s:%s", role, database)
+		id = fmt.Sprintf("%s:%s", role, databaseWrapped)
 	}
 
 	d.SetId(id)

Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,11 @@ func CreateGrant(d *schema.ResourceData, meta interface{}) error {`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
	`217`	`+ // DB and table have to be wrappedsin backticks in some cases.`
	`218`	`+ databaseWrapped := formatDatabaseName(database)`
	`219`	`+ tableWrapped := formatTableName(table)`
`217`	`220`	`if (!isRole \|\| hasPrivs) && rolesGranted == 0 {`
`218`		`- grantOn = fmt.Sprintf(" ON %s.%s", database, table)`
	`221`	`+ grantOn = fmt.Sprintf(" ON %s.%s", databaseWrapped, tableWrapped)`
`219`	`222`	`}`
`220`	`223`
`221`	`224`	`stmtSQL := fmt.Sprintf("GRANT %s%s TO %s",`
`@@ -242,9 +245,9 @@ func CreateGrant(d *schema.ResourceData, meta interface{}) error {`
`242`	`245`	`return fmt.Errorf("Error running SQL (%s): %s", stmtSQL, err)`
`243`	`246`	`}`
`244`	`247`
`245`		`- id := fmt.Sprintf("%s@%s:%s", user, host, database)`
	`248`	`+ id := fmt.Sprintf("%s@%s:%s", user, host, databaseWrapped)`
`246`	`249`	`if isRole {`
`247`		`- id = fmt.Sprintf("%s:%s", role, database)`
	`250`	`+ id = fmt.Sprintf("%s:%s", role, databaseWrapped)`
`248`	`251`	`}`
`249`	`252`
`250`	`253`	`d.SetId(id)`