external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handles null comment cases

pull/7388/head
gurkanindibay 2023-12-17 21:09:45 +03:00
parent d8448dd088
commit e258122fde
6 changed files with 66 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/distributed/deparser/deparse_database_stmts.c
View File

@ -323,10 +323,9 @@ DeparseDatabaseCommentStmt(Node *node)
char *databaseName = strVal(stmt->object);
char *comment = stmt->comment!=NULL?quote_literal_cstr(stmt->comment):"NULL";
appendStringInfo(&str, "COMMENT ON DATABASE %s IS %s;",
databaseName,
quote_literal_cstr(stmt->comment));
appendStringInfo(&str, "COMMENT ON DATABASE %s IS %s;",databaseName,comment);
return str.data;
}

6
src/backend/distributed/deparser/deparse_role_stmts.c
View File

@ -543,11 +543,9 @@ DeparseRoleCommentStmt(Node *node)
initStringInfo(&str);
char *roleName = strVal(stmt->object);
char *comment = stmt->comment!=NULL?quote_literal_cstr(stmt->comment):"NULL";
appendStringInfo(&str, "COMMENT ON ROLE %s IS %s;",
roleName,
quote_literal_cstr(stmt->comment));
appendStringInfo(&str, "COMMENT ON ROLE %s IS %s;",roleName,comment);
return str.data;
}

32
src/test/regress/expected/comment_on_database.out
View File

@ -5,10 +5,10 @@ create database test1;
comment on DATABASE test1 is 'test-comment';
SELECT result FROM run_command_on_all_nodes(
$$
SELECT ds.description AS database_comment
FROM pg_database d
LEFT JOIN pg_shdescription ds ON d.oid = ds.objoid
WHERE d.datname = 'test1';
SELECT ds.description AS database_comment
FROM pg_database d
LEFT JOIN pg_shdescription ds ON d.oid = ds.objoid
WHERE d.datname = 'test1';
$$
);
result
@ -21,10 +21,10 @@ WHERE d.datname = 'test1';
comment on DATABASE test1 is 'comment-needs\!escape';
SELECT result FROM run_command_on_all_nodes(
$$
SELECT ds.description AS database_comment
FROM pg_database d
LEFT JOIN pg_shdescription ds ON d.oid = ds.objoid
WHERE d.datname = 'test1';
SELECT ds.description AS database_comment
FROM pg_database d
LEFT JOIN pg_shdescription ds ON d.oid = ds.objoid
WHERE d.datname = 'test1';
$$
);
result
@ -32,6 +32,22 @@ WHERE d.datname = 'test1';
comment-needs\!escape
comment-needs\!escape
comment-needs\!escape
(3 rows)
comment on DATABASE test1 is null;
SELECT result FROM run_command_on_all_nodes(
$$
SELECT ds.description AS database_comment
FROM pg_database d
LEFT JOIN pg_shdescription ds ON d.oid = ds.objoid
WHERE d.datname = 'test1';
$$
);
result
---------------------------------------------------------------------
(3 rows)
drop DATABASE test1;

16
src/test/regress/expected/comment_on_role.out
View File

@ -31,6 +31,22 @@ SELECT result FROM run_command_on_all_nodes(
comment-needs\!escape
comment-needs\!escape
comment-needs\!escape
(3 rows)
comment on role role1 is NULL;
SELECT result FROM run_command_on_all_nodes(
$$
SELECT ds.description AS role_comment
FROM pg_roles r
LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
WHERE r.rolname = 'role1';
$$
);
result
---------------------------------------------------------------------
(3 rows)
drop role role1;

11
src/test/regress/sql/comment_on_database.sql
View File

@ -27,6 +27,17 @@ SELECT result FROM run_command_on_all_nodes(
$$
);
comment on DATABASE test1 is null;
SELECT result FROM run_command_on_all_nodes(
$$
SELECT ds.description AS database_comment
FROM pg_database d
LEFT JOIN pg_shdescription ds ON d.oid = ds.objoid
WHERE d.datname = 'test1';
$$
);
drop DATABASE test1;
reset citus.enable_create_database_propagation;
reset citus.grep_remote_commands;

11
src/test/regress/sql/comment_on_role.sql
View File

@ -26,6 +26,17 @@ SELECT result FROM run_command_on_all_nodes(
$$
);
comment on role role1 is NULL;
SELECT result FROM run_command_on_all_nodes(
$$
SELECT ds.description AS role_comment
FROM pg_roles r
LEFT JOIN pg_shdescription ds ON r.oid = ds.objoid
WHERE r.rolname = 'role1';
$$
);
drop role role1;
reset citus.grep_remote_commands;
reset citus.log_remote_commands;