*: add support to create/alter user with resource group option (pingc…

…ap#26) Signed-off-by: BornChanger <[email protected]>
BornChanger · Dec 6, 2022 · 3304176 · 3304176
1 parent 35319e8
commit 3304176
Show file tree

Hide file tree

Showing 4 changed files with 13,325 additions and 2,852 deletions.
diff --git a/executor/simple.go b/executor/simple.go
@@ -946,13 +946,21 @@ func (e *SimpleExec) executeCreateUser(ctx context.Context, s *ast.CreateUserStm
 		passwdlockinfo.passwordExpired = "Y"
 	}
 
-	var userAttributes any = nil
+	var userAttributes = ""
 	if s.CommentOrAttributeOption != nil {
-		if s.CommentOrAttributeOption.Type == ast.UserCommentType {
-			userAttributes = fmt.Sprintf("{\"metadata\": {\"comment\": \"%s\"}}", s.CommentOrAttributeOption.Value)
-		} else if s.CommentOrAttributeOption.Type == ast.UserAttributeType {
-			userAttributes = fmt.Sprintf("{\"metadata\": %s}", s.CommentOrAttributeOption.Value)
+		if s.CommentOrAttributeOption.Type != ast.UserResourceGroupName {
+			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)
 		}
+	} else {
+		userAttributes = `{"metadata": {"resource group": "default"}}`
 	}
 
 	tokenIssuer := ""
@@ -1587,8 +1595,10 @@ func (e *SimpleExec) executeAlterUser(ctx context.Context, s *ast.AlterUserStmt)
 			newAttributesStr := ""
 			if s.CommentOrAttributeOption.Type == ast.UserCommentType {
 				newAttributesStr = fmt.Sprintf(`{"metadata": {"comment": "%s"}}`, s.CommentOrAttributeOption.Value)
-			} else {
+			} 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)
 			}
 			fields = append(fields, alterField{"user_attributes=json_merge_patch(coalesce(user_attributes, '{}'), %?)", newAttributesStr})
 		}

diff --git a/parser/ast/misc.go b/parser/ast/misc.go
@@ -1517,6 +1517,7 @@ const (
 
 	UserCommentType
 	UserAttributeType
+	UserResourceGroupName
 )
 
 type PasswordOrLockOption struct {
@@ -1569,6 +1570,9 @@ func (c *CommentOrAttributeOption) Restore(ctx *format.RestoreCtx) error {
 	} else if c.Type == UserAttributeType {
 		ctx.WriteKeyWord(" ATTRIBUTE ")
 		ctx.WriteString(c.Value)
+	} else if c.Type == UserResourceGroupName {
+		ctx.WriteKeyWord(" RESOURCE GROUP ")
+		ctx.WriteString(c.Value)
 	}
 	return nil
 }