Merge pull request #1196 from yasir-hussain-shah/fix/ivorysql_prefix_configs

gaoxueyu · web-flow · commit ba9c6f33263f · 2026-03-03T14:59:13.000+08:00
reserve ivorysql prefix for gucs
diff --git a/contrib/ivorysql_ora/expected/ora_misc_functions.out b/contrib/ivorysql_ora/expected/ora_misc_functions.out
@@ -4181,3 +4181,10 @@ reset nls_date_format;
 reset nls_timestamp_format;
 reset nls_timestamp_tz_format;
 reset default_text_search_config;
+-- should throw errors, because dummy_config is not a valid configuration name
+set ivorysql.dummy_config to dummy;
+ERROR:  invalid configuration parameter name "ivorysql.dummy_config"
+DETAIL:  "ivorysql" is a reserved prefix.
+reset ivorysql.dummy_config;
+ERROR:  invalid configuration parameter name "ivorysql.dummy_config"
+DETAIL:  "ivorysql" is a reserved prefix.
diff --git a/contrib/ivorysql_ora/sql/ora_misc_functions.sql b/contrib/ivorysql_ora/sql/ora_misc_functions.sql
@@ -2345,3 +2345,6 @@ reset nls_date_format;
 reset nls_timestamp_format;
 reset nls_timestamp_tz_format;
 reset default_text_search_config;
+-- should throw errors, because dummy_config is not a valid configuration name
+set ivorysql.dummy_config to dummy;
+reset ivorysql.dummy_config;
diff --git a/contrib/ivorysql_ora/src/ivorysql_ora.c b/contrib/ivorysql_ora/src/ivorysql_ora.c
@@ -126,6 +126,8 @@ _PG_init(void)
 								0,
 								utl_file_umask_check_hook,
 								utl_file_umask_assign_hook, NULL);
+
+	MarkGUCPrefixReserved("ivorysql");
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,8 @@ _PG_init(void)`
`126`	`126`	`0,`
`127`	`127`	`utl_file_umask_check_hook,`
`128`	`128`	`utl_file_umask_assign_hook, NULL);`
	`129`	`+`
	`130`	`+ MarkGUCPrefixReserved("ivorysql");`
`129`	`131`	`}`
`130`	`132`
`131`	`133`	`/*`