Merge pull request petoju#13 from petoju/feature/add-function-call

Replace no such grant with function call
thealtoclef · Jun 9, 2022 · 62015ce · 62015ce
2 parents f54602b + 4f9d177
commit 62015ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/mysql/provider.go b/mysql/provider.go
@@ -24,8 +24,6 @@ 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,11 +536,10 @@ 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 isNonExistingGrant(err) {
+		return []*MySQLGrant{}, nil
 	}
+
 	if err != nil {
 		return nil, err
 	}