postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-04-20 13:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with timescaledb.allow_install_without_preload GUC not working

Browse Source 
Can't use a GUC variable before extension is loaded.
This commit is contained in:
Matvey Arye 2017-05-30 10:07:19 -04:00 committed by Matvey Arye
parent 275f88c705
commit 88a9849adb
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/guc.c
View File

@ -5,7 +5,6 @@
bool guc_disable_optimizations = false;
bool guc_optimize_non_hypertables = false;
bool guc_allow_install_without_preload = false;
bool guc_restoring = false;
@ -32,16 +31,6 @@ _guc_init(void)
NULL,
NULL);
DefineCustomBoolVariable("timescaledb.allow_install_without_preload", "Allow installing timescaledb without preloading the library (DANGEROUS)",
NULL,
&guc_allow_install_without_preload,
false,
PGC_USERSET,
0,
NULL,
NULL,
NULL);
DefineCustomBoolVariable("timescaledb.restoring", "Install timescale in restoring mode",
"Used for running pg_restore",
&guc_restoring,

1
src/guc.h
View File

@ -4,7 +4,6 @@
extern bool guc_disable_optimizations;
extern bool guc_optimize_non_hypertables;
extern bool guc_allow_install_without_preload;
void _guc_init(void);
void _guc_fini(void);

6
src/init.c
View File

@ -42,8 +42,12 @@ _PG_init(void)
{
if (!process_shared_preload_libraries_in_progress)
{
/* cannot use GUC variable here since extension not yet loaded */
char *allow_install_without_preload = GetConfigOptionByName("timescaledb.allow_install_without_preload", NULL, true);
if (!guc_allow_install_without_preload)
if (allow_install_without_preload == NULL ||
strlen(allow_install_without_preload) != 2 ||
strncmp(allow_install_without_preload, "on", 2) != 0)
{
char *config_file = GetConfigOptionByName("config_file", NULL, false);