diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.y | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index c46914d87bb..c554e634fbb 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -14512,10 +14512,16 @@ doNegateFloat(Value *v) static Node * makeAndExpr(Node *lexpr, Node *rexpr, int location) { + Node *lexp = lexpr; + + /* Look through AEXPR_PAREN nodes so they don't affect flattening */ + while (IsA(lexp, A_Expr) && + ((A_Expr *) lexp)->kind == AEXPR_PAREN) + lexp = ((A_Expr *) lexp)->lexpr; /* Flatten "a AND b AND c ..." to a single BoolExpr on sight */ - if (IsA(lexpr, BoolExpr)) + if (IsA(lexp, BoolExpr)) { - BoolExpr *blexpr = (BoolExpr *) lexpr; + BoolExpr *blexpr = (BoolExpr *) lexp; if (blexpr->boolop == AND_EXPR) { @@ -14529,10 +14535,16 @@ makeAndExpr(Node *lexpr, Node *rexpr, int location) static Node * makeOrExpr(Node *lexpr, Node *rexpr, int location) { + Node *lexp = lexpr; + + /* Look through AEXPR_PAREN nodes so they don't affect flattening */ + while (IsA(lexp, A_Expr) && + ((A_Expr *) lexp)->kind == AEXPR_PAREN) + lexp = ((A_Expr *) lexp)->lexpr; /* Flatten "a OR b OR c ..." to a single BoolExpr on sight */ - if (IsA(lexpr, BoolExpr)) + if (IsA(lexp, BoolExpr)) { - BoolExpr *blexpr = (BoolExpr *) lexpr; + BoolExpr *blexpr = (BoolExpr *) lexp; if (blexpr->boolop == OR_EXPR) { |