Skip to content

Commit fc9260d

Browse files
authored
Merge pull request IvorySQL#801 from bigplaice/IVORY_REL_4_STABLE
set identifier_vase_switch to value from pg_control file
2 parents 666b03f + 4dc9851 commit fc9260d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/backend/access/transam/xlog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5461,17 +5461,17 @@ void SetCaseGucOption(char* path)
54615461
if (casemode == NORMAL)
54625462
{
54635463
SetConfigOption("ivorysql.identifier_case_switch", "normal",
5464-
PGC_USERSET, PGC_S_OVERRIDE);
5464+
PGC_USERSET, PGC_S_DEFAULT);
54655465
}
54665466
else if (casemode == INTERCHANGE)
54675467
{
54685468
SetConfigOption("ivorysql.identifier_case_switch", "interchange",
5469-
PGC_USERSET, PGC_S_OVERRIDE);
5469+
PGC_USERSET, PGC_S_DEFAULT);
54705470
}
54715471
else if (casemode == LOWERCASE)
54725472
{
54735473
SetConfigOption("ivorysql.identifier_case_switch", "lowercase",
5474-
PGC_USERSET, PGC_S_OVERRIDE);
5474+
PGC_USERSET, PGC_S_DEFAULT);
54755475
}
54765476
else
54775477
ereport(FATAL,

src/backend/postmaster/postmaster.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -773,16 +773,16 @@ PostmasterMain(int argc, char *argv[])
773773
ExitPostmaster(1);
774774
}
775775

776+
/* set database_style here */
777+
SetCaseGucOption(userDoption);
778+
776779
/*
777780
* Locate the proper configuration files and data directory, and read
778781
* postgresql.conf for the first time.
779782
*/
780783
if (!SelectConfigFiles(userDoption, progname))
781784
ExitPostmaster(2);
782785

783-
/* set database_style here */
784-
SetCaseGucOption(userDoption);
785-
786786
if (output_config_variable != NULL)
787787
{
788788
/*

src/backend/utils/misc/ivorysql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010

1111
ivorysql.enable_emptystring_to_NULL = 'on'
1212
shared_preload_libraries = 'liboracle_parser, ivorysql_ora' # (change requires restart)
13-
ivorysql.identifier_case_switch = interchange # set the case conversion mode. range [normal,interchange,lowercase]
13+
#ivorysql.identifier_case_switch = interchange # set the case conversion mode. range [normal,interchange,lowercase]

0 commit comments

Comments
 (0)