Fix ansi and setconfig

babelfish-for-postgresql · Nov 26, 2024 · 359fa3a · 359fa3a
1 parent d17cf0f
commit 359fa3a
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 1 deletion.
diff --git a/contrib/babelfishpg_tds/src/backend/tds/tdslogin.c b/contrib/babelfishpg_tds/src/backend/tds/tdslogin.c
@@ -1134,6 +1134,17 @@ ProcessLoginFlags(LoginRequest loginInfo)
 	}
 }
 
+/*
+ * TdsResetLoginFlags - Resets the session properties which
+ * we provided during login time.
+ * Wrapper of ProcessLoginFlags, since we do not expose loginInfo.
+ */
+void
+TdsResetLoginFlags()
+{
+	ProcessLoginFlags(loginInfo);
+}
+
 /*
  * ProcessLoginInternal - internal workhorse for processing login
  * request.

diff --git a/contrib/babelfishpg_tds/src/backend/tds/tdsprotocol.c b/contrib/babelfishpg_tds/src/backend/tds/tdsprotocol.c
@@ -154,6 +154,8 @@ ResetTDSConnection(void)
 	TdsResetCache();
 	TdsResponseReset();
 	TdsResetBcpOffset();
+	TdsResetLoginFlags();
+
 	/* Retore previous isolation level when not called by sys.sp_reset_connection. */
 	if (!resetTdsConnectionFlag)
 	{

diff --git a/contrib/babelfishpg_tds/src/include/tds_int.h b/contrib/babelfishpg_tds/src/include/tds_int.h
@@ -296,6 +296,7 @@ extern void TdsSendLoginAck(Port *port);
 extern uint32_t GetClientTDSVersion(void);
 extern char *get_tds_login_domainname(void);
 extern void TdsSetDbContext(void);
+extern void TdsResetLoginFlags(void);
 
 /* Functions in backend/tds/tdsprotocol.c */
 extern int	TdsSocketBackend(void);

diff --git a/contrib/babelfishpg_tsql/src/guc.c b/contrib/babelfishpg_tsql/src/guc.c
@@ -1508,7 +1508,8 @@ void
 pltsql_validate_set_config_function(char *name, char *value)
 {
 	if (strncmp(name, PLTSQL_SESSION_ISOLATION_LEVEL, strlen(PLTSQL_SESSION_ISOLATION_LEVEL)) == 0 ||
-		strncmp(name, PLTSQL_TRANSACTION_ISOLATION_LEVEL, strlen(PLTSQL_TRANSACTION_ISOLATION_LEVEL)) == 0)
+		strncmp(name, PLTSQL_TRANSACTION_ISOLATION_LEVEL, strlen(PLTSQL_TRANSACTION_ISOLATION_LEVEL)) == 0 ||
+		strncmp(name, "role", strlen("role")) == 0)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

diff --git a/test/JDBC/expected/Test-sp_reset_connection.out b/test/JDBC/expected/Test-sp_reset_connection.out
@@ -483,3 +483,212 @@ int
 
 drop table babel_cursor_t1;
 GO
+
+
+-- GUCs testing
+-- 1. Ansi defaults
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_nulls', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_warnings', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_null_dflt_on', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_padding', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.implicit_transactions', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.quoted_identifier', true);
+GO
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+off
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+
+SET ANSI_DEFAULTS ON
+GO
+
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_nulls', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_warnings', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_null_dflt_on', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_padding', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.implicit_transactions', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.quoted_identifier', true);
+GO
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+
+-- reset
+exec sys.sp_reset_connection
+GO
+
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_nulls', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_warnings', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_null_dflt_on', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_padding', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.implicit_transactions', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.quoted_identifier', true);
+GO
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+~~START~~
+text
+off
+~~END~~
+
+~~START~~
+text
+on
+~~END~~
+
+
+-- babelfish_showplan_all
+SET babelfish_showplan_all ON
+GO
+
+-- explain output
+SELECT 1;
+GO
+~~START~~
+text
+Query Text: SELECT 1
+Result  (cost=0.00..0.01 rows=1 width=4)
+~~END~~
+
+~~START~~
+text
+Babelfish T-SQL Batch Parsing Time: 0.085 ms
+~~END~~
+
+
+-- reset
+exec sys.sp_reset_connection
+GO
+
+-- 1 output
+SELECT 1;
+GO
+~~START~~
+int
+1
+~~END~~
+
+
+
+-- set_config testing.
+-- search_path has source < PGC_S_SESSION in TSQL but it gets reset during ResetAll Gucs.
+-- Whereas role does not get reset since it uses GUC_NO_RESET_ALL, so we should not allow
+-- set_config for this option.
+SELECT CURRENT_SETTING('search_path', true)
+SELECT CURRENT_SETTING('role', true)
+GO
+~~START~~
+text
+master_dbo, "$user", sys, pg_catalog
+~~END~~
+
+~~START~~
+text
+master_dbo
+~~END~~
+
+
+SELECT set_config('search_path', 'sys', false);
+GO
+~~START~~
+text
+sys
+~~END~~
+
+SELECT set_config('role', 'jdbc_user', false);
+GO
+~~START~~
+text
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: set_config not allowed for option role)~~
+
+
+-- reset
+exec sp_reset_connection
+GO
+
+SELECT CURRENT_SETTING('search_path', true)
+SELECT CURRENT_SETTING('role', true)
+GO
+~~START~~
+text
+master_dbo, "$user", sys, pg_catalog
+~~END~~
+
+~~START~~
+text
+master_dbo
+~~END~~
+
diff --git a/test/JDBC/input/storedProcedures/Test-sp_reset_connection.mix b/test/JDBC/input/storedProcedures/Test-sp_reset_connection.mix
@@ -228,4 +228,76 @@ SELECT @@cursor_rows;
 GO
 
 drop table babel_cursor_t1;
+GO
+
+-- GUCs testing
+
+-- 1. Ansi defaults
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_nulls', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_warnings', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_null_dflt_on', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_padding', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.implicit_transactions', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.quoted_identifier', true);
+GO
+
+SET ANSI_DEFAULTS ON
+GO
+
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_nulls', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_warnings', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_null_dflt_on', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_padding', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.implicit_transactions', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.quoted_identifier', true);
+GO
+
+-- reset
+exec sys.sp_reset_connection
+GO
+
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_nulls', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_warnings', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_null_dflt_on', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.ansi_padding', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.implicit_transactions', true);
+SELECT CURRENT_SETTING('babelfishpg_tsql.quoted_identifier', true);
+GO
+
+-- babelfish_showplan_all
+SET babelfish_showplan_all ON
+GO
+
+-- explain output
+SELECT 1;
+GO
+
+-- reset
+exec sys.sp_reset_connection
+GO
+
+-- 1 output
+SELECT 1;
+GO
+
+-- set_config testing.
+
+-- search_path has source < PGC_S_SESSION in TSQL but it gets reset during ResetAll Gucs.
+-- Whereas role does not get reset since it uses GUC_NO_RESET_ALL, so we should not allow
+-- set_config for this option.
+SELECT CURRENT_SETTING('search_path', true)
+SELECT CURRENT_SETTING('role', true)
+GO
+
+SELECT set_config('search_path', 'sys', false);
+GO
+SELECT set_config('role', 'jdbc_user', false);
+GO
+
+-- reset
+exec sp_reset_connection
+GO
+
+SELECT CURRENT_SETTING('search_path', true)
+SELECT CURRENT_SETTING('role', true)
 GO