Skip to content

Commit f2f718e

Browse files
committed
Fix #8508 - Conversion Error with old.field in UPDATE OR INSERT.
1 parent 7db69df commit f2f718e

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/dsql/StmtNodes.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11437,7 +11437,13 @@ static ReturningClause* dsqlProcessReturning(DsqlCompilerScratch* dsqlScratch, d
1143711437

1143811438
// When RETURNING context marked with CTX_null is processed first, parameter
1143911439
// node should be fixed when resolving parameters in the real context.
11440-
if (nodeIs<NullNode>(parameterNode->dsqlParameter->par_node))
11440+
11441+
auto parNode = parameterNode->dsqlParameter->par_node;
11442+
11443+
if (const auto aliasNode = nodeAs<DsqlAliasNode>(parNode))
11444+
parNode = aliasNode->value;
11445+
11446+
if (nodeIs<NullNode>(parNode))
1144111447
{
1144211448
parameterNode->dsqlParameter->par_node = src;
1144311449
DsqlDescMaker::fromNode(dsqlScratch, &parameterNode->dsqlParameter->par_desc, src, true);

0 commit comments

Comments
 (0)