Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .unreleased/pr_10369
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes: #10369 Fix typo in error message about MERGE support on compressed hypertables
Thanks: @igor2x for reporting a typo in a MERGE support error message
5 changes: 3 additions & 2 deletions tsl/src/planner.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,9 @@ tsl_set_rel_pathlist_dml(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTbl
{
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("The MERGE command with UPDATE/DELETE merge actions is not support on "
"compressed hypertables")));
errmsg(
"The MERGE command with UPDATE/DELETE merge actions is not supported on "
"compressed hypertables")));
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions tsl/test/shared/expected/merge_dml.out
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,15 @@ USING source s
ON t.time = s.time AND t.device_id = s.device_id
WHEN MATCHED THEN
UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metrics);
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE DELETE matched rows for compressed hypertable
-- should report error as DELETE is not allowed on compressed hypertable
MERGE INTO metrics_compressed t
USING source s
ON t.time = s.time AND t.device_id = s.device_id
WHEN MATCHED THEN
DELETE;
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE UDPATE/INSERT matched rows for compressed hypertable
-- should report error as UPDATE is not allowed on compressed hypertable
MERGE INTO metrics_compressed t
Expand All @@ -211,7 +211,7 @@ UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metric
WHEN NOT MATCHED THEN
INSERT (time, device_id, v0, v1, v2, v3) VALUES
('2021-11-01 00:00:05', 2, 1,2,3,4);
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE DELETE/INSERT matched rows for compressed hypertable
-- should report error as DELETE is not allowed on compressed hypertable
MERGE INTO metrics_compressed t
Expand All @@ -222,23 +222,23 @@ MERGE INTO metrics_compressed t
WHEN NOT MATCHED THEN
INSERT (time, device_id, v0, v1, v2, v3) VALUES
('2021-11-01 00:00:05', 2, 1,2,3,4);
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE UDPATE matched rows for space partitioned compressed hypertable
-- should report error as UPDATE is not allowed on compressed hypertable
MERGE INTO metrics_space_compressed t
USING source s
ON t.time = s.time AND t.device_id = s.device_id
WHEN MATCHED THEN
UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metrics);
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE DELETE matched rows for space partitioned compressed hypertable
-- should report error as DELETE is not allowed on compressed hypertable
MERGE INTO metrics_space_compressed t
USING source s
ON t.time = s.time AND t.device_id = s.device_id
WHEN MATCHED THEN
DELETE;
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE UDPATE/INSERT matched rows for space partitioned compressed hypertable
-- should report error as UPDATE is not allowed on compressed hypertable
MERGE INTO metrics_space_compressed t
Expand All @@ -249,7 +249,7 @@ UPDATE SET v1 = s.filler_1 * 1.23, v2 = (SELECT DISTINCT count(time) from metric
WHEN NOT MATCHED THEN
INSERT (time, device_id, v0, v1, v2, v3) VALUES
('2021-11-01 00:00:05', 2, 1,2,3,4);
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
-- MERGE DELETE/INSERT matched rows for space partitioned compressed hypertable
-- should report error as DELETE is not allowed on compressed hypertable
MERGE INTO metrics_space_compressed t
Expand All @@ -260,5 +260,5 @@ MERGE INTO metrics_space_compressed t
WHEN NOT MATCHED THEN
INSERT (time, device_id, v0, v1, v2, v3) VALUES
('2021-11-01 00:00:05', 2, 1,2,3,4);
ERROR: The MERGE command with UPDATE/DELETE merge actions is not support on compressed hypertables
ERROR: The MERGE command with UPDATE/DELETE merge actions is not supported on compressed hypertables
\set ON_ERROR_STOP 1
Loading