From 652faf0324e7c2e7fa4c070514def1b4d6c4243e Mon Sep 17 00:00:00 2001 From: pranav jain Date: Tue, 4 Feb 2025 08:04:02 +0000 Subject: [PATCH] cherry-picking fix of babel_5469 Signed-off-by: pranav jain --- contrib/babelfishpg_tsql/src/rolecmds.c | 2 +- test/JDBC/expected/sys-suser_sname-vu-verify.out | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/babelfishpg_tsql/src/rolecmds.c b/contrib/babelfishpg_tsql/src/rolecmds.c index 9730b4d8b1a..c00250fff4f 100644 --- a/contrib/babelfishpg_tsql/src/rolecmds.c +++ b/contrib/babelfishpg_tsql/src/rolecmds.c @@ -979,7 +979,7 @@ suser_name(PG_FUNCTION_ARGS) server_user_id = PG_ARGISNULL(0) ? InvalidOid : PG_GETARG_OID(0); if (server_user_id == InvalidOid) - server_user_id = GetSessionUserId(); + PG_RETURN_NULL(); if (server_user_id == 0x02) { diff --git a/test/JDBC/expected/sys-suser_sname-vu-verify.out b/test/JDBC/expected/sys-suser_sname-vu-verify.out index 3ec98894c19..c58a85807cd 100644 --- a/test/JDBC/expected/sys-suser_sname-vu-verify.out +++ b/test/JDBC/expected/sys-suser_sname-vu-verify.out @@ -43,7 +43,7 @@ SELECT * FROM sys_suser_sname_view_vu_prepare GO ~~START~~ nvarchar -jdbc_user + ~~END~~ @@ -51,7 +51,7 @@ EXEC sys_suser_sname_proc_vu_prepare GO ~~START~~ nvarchar -jdbc_user + ~~END~~ @@ -59,7 +59,7 @@ SELECT sys_suser_sname_func_vu_prepare() GO ~~START~~ varchar -jdbc_user + ~~END~~ @@ -67,7 +67,7 @@ SELECT * FROM sys_suser_name_view_vu_prepare GO ~~START~~ nvarchar -jdbc_user + ~~END~~ @@ -75,7 +75,7 @@ EXEC sys_suser_name_proc_vu_prepare GO ~~START~~ nvarchar -jdbc_user + ~~END~~ @@ -83,6 +83,6 @@ SELECT sys_suser_name_func_vu_prepare() GO ~~START~~ varchar -jdbc_user + ~~END~~