Skip to content

Commit 0e2f12b

Browse files
svenklemmtimescale-automation
authored andcommitted
Fix typo in error message about MERGE support on compressed hypertables
(cherry picked from commit 7d393ec)
1 parent c7d565f commit 0e2f12b

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

.unreleased/pr_10369

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fixes: #10369 Fix typo in error message about MERGE support on compressed hypertables
2+
Thanks: @igor2x for reporting a typo in a MERGE support error message

tsl/src/planner.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ tsl_set_rel_pathlist_dml(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTbl
168168
{
169169
ereport(ERROR,
170170
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
171-
errmsg("The MERGE command with UPDATE/DELETE merge actions is not support on "
172-
"compressed hypertables")));
171+
errmsg(
172+
"The MERGE command with UPDATE/DELETE merge actions is not supported on "
173+
"compressed hypertables")));
173174
}
174175
}
175176
}

tsl/test/shared/expected/merge_dml.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ USING source s
192192
ON t.time = s.time AND t.device_id = s.device_id
193193
WHEN MATCHED THEN
194194
UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metrics);
195-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
195+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
196196
-- MERGE DELETE matched rows for compressed hypertable
197197
-- should report error as DELETE is not allowed on compressed hypertable
198198
MERGE INTO metrics_compressed t
199199
USING source s
200200
ON t.time = s.time AND t.device_id = s.device_id
201201
WHEN MATCHED THEN
202202
DELETE;
203-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
203+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
204204
-- MERGE UDPATE/INSERT matched rows for compressed hypertable
205205
-- should report error as UPDATE is not allowed on compressed hypertable
206206
MERGE INTO metrics_compressed t
@@ -211,7 +211,7 @@ UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metric
211211
WHEN NOT MATCHED THEN
212212
INSERT (time, device_id, v0, v1, v2, v3) VALUES
213213
('2021-11-01 00:00:05', 2, 1,2,3,4);
214-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
214+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
215215
-- MERGE DELETE/INSERT matched rows for compressed hypertable
216216
-- should report error as DELETE is not allowed on compressed hypertable
217217
MERGE INTO metrics_compressed t
@@ -222,23 +222,23 @@ MERGE INTO metrics_compressed t
222222
WHEN NOT MATCHED THEN
223223
INSERT (time, device_id, v0, v1, v2, v3) VALUES
224224
('2021-11-01 00:00:05', 2, 1,2,3,4);
225-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
225+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
226226
-- MERGE UDPATE matched rows for space partitioned compressed hypertable
227227
-- should report error as UPDATE is not allowed on compressed hypertable
228228
MERGE INTO metrics_space_compressed t
229229
USING source s
230230
ON t.time = s.time AND t.device_id = s.device_id
231231
WHEN MATCHED THEN
232232
UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metrics);
233-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
233+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
234234
-- MERGE DELETE matched rows for space partitioned compressed hypertable
235235
-- should report error as DELETE is not allowed on compressed hypertable
236236
MERGE INTO metrics_space_compressed t
237237
USING source s
238238
ON t.time = s.time AND t.device_id = s.device_id
239239
WHEN MATCHED THEN
240240
DELETE;
241-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
241+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
242242
-- MERGE UDPATE/INSERT matched rows for space partitioned compressed hypertable
243243
-- should report error as UPDATE is not allowed on compressed hypertable
244244
MERGE INTO metrics_space_compressed t
@@ -249,7 +249,7 @@ UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metric
249249
WHEN NOT MATCHED THEN
250250
INSERT (time, device_id, v0, v1, v2, v3) VALUES
251251
('2021-11-01 00:00:05', 2, 1,2,3,4);
252-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
252+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
253253
-- MERGE DELETE/INSERT matched rows for space partitioned compressed hypertable
254254
-- should report error as DELETE is not allowed on compressed hypertable
255255
MERGE INTO metrics_space_compressed t
@@ -260,5 +260,5 @@ MERGE INTO metrics_space_compressed t
260260
WHEN NOT MATCHED THEN
261261
INSERT (time, device_id, v0, v1, v2, v3) VALUES
262262
('2021-11-01 00:00:05', 2, 1,2,3,4);
263-
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
263+
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
264264
\set ON_ERROR_STOP 1

0 commit comments

Comments
 (0)