Merged in bugfix/PMCORE-3406 (pull request #8208)

PMCORE-3406

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Andrea Adamczyk
2021-10-08 17:10:52 +00:00
committed by Julio Cesar Laura Avendaño

View File

@@ -772,9 +772,10 @@ EOREGEX;
$last = array_pop( $stripped ); $last = array_pop( $stripped );
if (! $alias && $last['expr_type'] == 'colref') { if (! $alias && $last['expr_type'] == 'colref') {
$prev = array_pop( $stripped ); $prev = array_pop( $stripped );
if ($prev['expr_type'] == 'operator' || $prev['expr_type'] == 'const' || $prev['expr_type'] == 'function' || $prev['expr_type'] == 'expression' || $exprType = isset($prev['expr_type']) ? $prev['expr_type'] : null;
if ($exprType == 'operator' || $exprType == 'const' || $exprType == 'function' || $exprType == 'expression' ||
#$prev['expr_type'] == 'aggregate_function' || #$prev['expr_type'] == 'aggregate_function' ||
$prev['expr_type'] == 'subquery' || $prev['expr_type'] == 'colref') { $exprType == 'subquery' || $exprType == 'colref') {
$alias = $last['base_expr']; $alias = $last['base_expr'];
#remove the last token #remove the last token