File tree Expand file tree Collapse file tree 3 files changed +67
-2
lines changed Expand file tree Collapse file tree 3 files changed +67
-2
lines changed Original file line number Diff line number Diff line change @@ -99,8 +99,16 @@ should_load_on_variable_set(Node *utility_stmt)
99
99
{
100
100
VariableSetStmt * stmt = (VariableSetStmt * ) utility_stmt ;
101
101
102
- /* Do not load when setting the guc */
103
- return strcmp (stmt -> name , GUC_DISABLE_LOAD_NAME ) != 0 ;
102
+ switch (stmt -> kind )
103
+ {
104
+ case VAR_SET_VALUE :
105
+ case VAR_SET_DEFAULT :
106
+ case VAR_RESET :
107
+ /* Do not load when setting the guc to disable load */
108
+ return stmt -> name == NULL || strcmp (stmt -> name , GUC_DISABLE_LOAD_NAME ) != 0 ;
109
+ default :
110
+ return true;
111
+ }
104
112
}
105
113
106
114
static bool
Original file line number Diff line number Diff line change @@ -154,6 +154,48 @@ SET timescaledb.disable_load = 'not bool';
154
154
WARNING: mock post_analyze_hook "mock-1"
155
155
ERROR: parameter "timescaledb.disable_load" requires a Boolean value
156
156
\set ON_ERROR_STOP 1
157
+ \c single :ROLE_SUPERUSER
158
+ RESET ALL;
159
+ WARNING: mock init "mock-1"
160
+ WARNING: mock post_analyze_hook "mock-1"
161
+ SELECT 1;
162
+ WARNING: mock post_analyze_hook "mock-1"
163
+ ?column?
164
+ ----------
165
+ 1
166
+ (1 row)
167
+
168
+ \c single :ROLE_SUPERUSER
169
+ SET timescaledb.disable_load TO DEFAULT;
170
+ SELECT 1;
171
+ WARNING: mock init "mock-1"
172
+ WARNING: mock post_analyze_hook "mock-1"
173
+ ?column?
174
+ ----------
175
+ 1
176
+ (1 row)
177
+
178
+ \c single :ROLE_SUPERUSER
179
+ RESET timescaledb.disable_load;
180
+ SELECT 1;
181
+ WARNING: mock init "mock-1"
182
+ WARNING: mock post_analyze_hook "mock-1"
183
+ ?column?
184
+ ----------
185
+ 1
186
+ (1 row)
187
+
188
+ \c single :ROLE_SUPERUSER
189
+ SET timescaledb.other = 'on';
190
+ WARNING: mock init "mock-1"
191
+ WARNING: mock post_analyze_hook "mock-1"
192
+ SELECT 1;
193
+ WARNING: mock post_analyze_hook "mock-1"
194
+ ?column?
195
+ ----------
196
+ 1
197
+ (1 row)
198
+
157
199
\set ON_ERROR_STOP 0
158
200
--cannot update extension after .so of previous version already loaded
159
201
ALTER EXTENSION timescaledb UPDATE TO 'mock-2';
Original file line number Diff line number Diff line change @@ -52,6 +52,21 @@ SELECT 1;
52
52
SET timescaledb .disable_load = ' not bool' ;
53
53
\set ON_ERROR_STOP 1
54
54
55
+ \c single :ROLE_SUPERUSER
56
+ RESET ALL;
57
+ SELECT 1 ;
58
+
59
+ \c single :ROLE_SUPERUSER
60
+ SET timescaledb .disable_load TO DEFAULT;
61
+ SELECT 1 ;
62
+
63
+ \c single :ROLE_SUPERUSER
64
+ RESET timescaledb .disable_load ;
65
+ SELECT 1 ;
66
+
67
+ \c single :ROLE_SUPERUSER
68
+ SET timescaledb .other = ' on' ;
69
+ SELECT 1 ;
55
70
56
71
\set ON_ERROR_STOP 0
57
72
-- cannot update extension after .so of previous version already loaded
You can’t perform that action at this time.
0 commit comments