Refactor code

Signed-off-by: P Aswini Kumar <[email protected]>
aswiniip · Sep 13, 2024 · 368e13c · 368e13c
1 parent 1c4db0f
commit 368e13c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/contrib/babelfishpg_tsql/src/pltsql.h b/contrib/babelfishpg_tsql/src/pltsql.h
@@ -2104,7 +2104,6 @@ extern void update_DropOwnedStmt(Node *n, List *role_list);
 extern void update_DropRoleStmt(Node *n, const char *role);
 extern void update_DropStmt(Node *n, const char *object);
 extern void update_GrantRoleStmt(Node *n, List *privs, List *roles);
-extern void update_RevokeRoleStmt(Node *n, List *privs, List *roles);
 extern void update_GrantStmt(Node *n, const char *object, const char *obj_schema, const char *grantee, const char *priv);
 extern void update_RenameStmt(Node *n, const char *old_name, const char *new_name);
 extern void update_ViewStmt(Node *n, const char *view_schema);

diff --git a/contrib/babelfishpg_tsql/src/pltsql_utils.c b/contrib/babelfishpg_tsql/src/pltsql_utils.c
@@ -1079,19 +1079,6 @@ update_GrantRoleStmt(Node *n, List *privs, List *roles)
 	stmt->grantee_roles = roles;
 }
 
-void
-update_RevokeRoleStmt(Node *n, List *privs, List *roles)
-{
-	GrantRoleStmt *stmt = (GrantRoleStmt *) n;
-
-	if (!IsA(stmt, GrantRoleStmt))
-		ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("query is not a RevokeRoleStmt")));
-
-	stmt->is_grant = false;
-	stmt->granted_roles = privs;
-	stmt->grantee_roles = roles;
-}
-
 void
 update_GrantStmt(Node *n, const char *object, const char *obj_schema, const char *grantee, const char *priv)
 {

diff --git a/contrib/babelfishpg_tsql/src/rolecmds.c b/contrib/babelfishpg_tsql/src/rolecmds.c
@@ -627,14 +627,7 @@ grant_dbo_to_login(const char* login, const char* db_name, bool is_grant)
 	tmp->location = -1;
 	tmp->rolename = pstrdup(login);
 
-	if (is_grant)
-	{
-		update_GrantRoleStmt(stmt, dbo, list_make1(tmp));
-	}
-	else
-	{
-		update_RevokeRoleStmt(stmt, dbo, list_make1(tmp));
-	}
+	update_GrantRoleStmt(stmt, dbo, list_make1(tmp));
 
 	/* Run the built query */
 	/* need to make a wrapper PlannedStmt */
@@ -643,11 +636,11 @@ grant_dbo_to_login(const char* login, const char* db_name, bool is_grant)
 	wrapper->canSetTag = false;
 	wrapper->utilityStmt = stmt;
 	wrapper->stmt_location = 0;
-	wrapper->stmt_len = 18;
+	wrapper->stmt_len = 23;
 
 	/* do this step */
 	ProcessUtility(wrapper,
-				   "(CREATE DATABASE )",
+				   "(ALTER DATABASE OWNER )",
 				   false,
 				   PROCESS_UTILITY_SUBCOMMAND,
 				   NULL,