Merge pull request petoju#12 from petoju/feature/fix-missing-grants

Return no grants (with no error) when there is no such grant
thealtoclef · Jun 7, 2022 · f54602b · f54602b
2 parents 450d2d4 + 8665c12
commit f54602b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/mysql/provider.go b/mysql/provider.go
@@ -24,6 +24,8 @@ const (
 	cleartextPasswords = "cleartext"
 	nativePasswords    = "native"
 	unknownVarErrCode  = 1193
+
+	mySQLErrorNoSuchGrant = 1133
 )
 
 type MySQLConfiguration struct {

diff --git a/mysql/resource_grant.go b/mysql/resource_grant.go
@@ -536,6 +536,11 @@ func showUserGrants(db *sql.DB, user string) ([]*MySQLGrant, error) {
 	sql := fmt.Sprintf("SHOW GRANTS FOR %s", user)
 	rows, err := db.Query(sql)
 
+	if driverErr, ok := err.(*mysql.MySQLError); ok {
+		if driverErr.Number == mySQLErrorNoSuchGrant {
+			return []*MySQLGrant{}, nil
+		}
+	}
 	if err != nil {
 		return nil, err
 	}