*: pass user's resource group name to sessionVars.ResourceGroupName (p…

…ingcap#27) Signed-off-by: BornChanger <[email protected]>
BornChanger · Dec 6, 2022 · ad41e83 · ad41e83
1 parent 3304176
commit ad41e83
Show file tree

Hide file tree

Showing 9 changed files with 785 additions and 520 deletions.
diff --git a/executor/simple.go b/executor/simple.go
@@ -949,18 +949,18 @@ func (e *SimpleExec) executeCreateUser(ctx context.Context, s *ast.CreateUserStm
 	var userAttributes = ""
 	if s.CommentOrAttributeOption != nil {
 		if s.CommentOrAttributeOption.Type != ast.UserResourceGroupName {
-			userAttributes = `{"metadata": {"resource group": "default"`
+			userAttributes = `{"metadata": {"resource_group": "default"`
 			if s.CommentOrAttributeOption.Type == ast.UserCommentType {
 				userAttributes += fmt.Sprintf(`, "comment": "%s"`, s.CommentOrAttributeOption.Value)
 			} else if s.CommentOrAttributeOption.Type == ast.UserAttributeType {
 				userAttributes = fmt.Sprintf(`,  %s`, s.CommentOrAttributeOption.Value)
 			}
 			userAttributes += `}}`
 		} else {
-			userAttributes = fmt.Sprintf(`{"metadata": {"resource group": "%s"}}`, s.CommentOrAttributeOption.Value)
+			userAttributes = fmt.Sprintf(`{"metadata": {"resource_group": "%s"}}`, s.CommentOrAttributeOption.Value)
 		}
 	} else {
-		userAttributes = `{"metadata": {"resource group": "default"}}`
+		userAttributes = `{"metadata": {"resource_group": "default"}}`
 	}
 
 	tokenIssuer := ""
@@ -1598,7 +1598,7 @@ func (e *SimpleExec) executeAlterUser(ctx context.Context, s *ast.AlterUserStmt)
 			} else if s.CommentOrAttributeOption.Type == ast.UserAttributeType {
 				newAttributesStr = fmt.Sprintf(`{"metadata": %s}`, s.CommentOrAttributeOption.Value)
 			} else {
-				newAttributesStr = fmt.Sprintf(`{"metadata": {"resource group": "%s"}}`, s.CommentOrAttributeOption.Value)
+				newAttributesStr = fmt.Sprintf(`{"metadata": {"resource_group": "%s"}}`, s.CommentOrAttributeOption.Value)
 			}
 			fields = append(fields, alterField{"user_attributes=json_merge_patch(coalesce(user_attributes, '{}'), %?)", newAttributesStr})
 		}