external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MERGE: In deparser, add missing check for RETURNING clause.

pull/6735/head
Teja Mupparti 2023-02-24 17:54:20 -08:00 committed by Teja Mupparti
parent d7b499929c
commit 9cbfdc86dd
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/distributed/deparser/ruleutils_15.c
View File

@ -53,6 +53,7 @@
#include "common/keywords.h" #include "common/keywords.h"
#include "distributed/citus_nodefuncs.h" #include "distributed/citus_nodefuncs.h"
#include "distributed/citus_ruleutils.h" #include "distributed/citus_ruleutils.h"
#include "distributed/multi_router_planner.h"
#include "executor/spi.h" #include "executor/spi.h"
#include "foreign/foreign.h" #include "foreign/foreign.h"
#include "funcapi.h" #include "funcapi.h"
@ -3723,7 +3724,6 @@ static void
get_merge_query_def(Query *query, deparse_context *context) get_merge_query_def(Query *query, deparse_context *context)
{ {
StringInfo buf = context->buf; StringInfo buf = context->buf;
RangeTblEntry *targetRte;
/* Insert the WITH clause if given */ /* Insert the WITH clause if given */
get_with_clause(query, context); get_with_clause(query, context);
@ -3731,7 +3731,7 @@ get_merge_query_def(Query *query, deparse_context *context)
/* /*
* Start the query with MERGE INTO <target> * Start the query with MERGE INTO <target>
*/ */
targetRte = rt_fetch(query->resultRelation, query->rtable); RangeTblEntry *targetRte = ExtractResultRelationRTE(query);
if (PRETTY_INDENT(context)) if (PRETTY_INDENT(context))
{ {
@ -3853,6 +3853,15 @@ get_merge_query_def(Query *query, deparse_context *context)
} }
} }
/*
* RETURNING is not supported in MERGE, so it must be NULL, but if PG adds it later,
* we might miss it, let's raise an exception to investigate.
*/
if (unlikely(query->returningList))
{
elog(ERROR, "Unexpected RETURNING clause in MERGE");
}
ereport(DEBUG1, (errmsg("<Deparsed MERGE query: %s>", buf->data))); ereport(DEBUG1, (errmsg("<Deparsed MERGE query: %s>", buf->data)));
} }