firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Fixed CORE-5408 - Result of boolean expression can not be concatenated with string literal.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2016-12-13 13:11:06 -02:00
parent 3dd3764f13
commit 64fa7dce85
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsql/parse-conflicts.txt
View File

@ -1 +1 @@
44 shift/reduce conflicts, 17 reduce/reduce conflicts.
44 shift/reduce conflicts, 21 reduce/reduce conflicts.

31
src/dsql/parse.y
View File

@ -6285,22 +6285,17 @@ distinct_predicate
%type <boolExprNode> between_predicate
between_predicate
: value BETWEEN value_between AND value_between %prec BETWEEN
{ $$ = newNode<ComparativeBoolNode>(blr_between, $1, $3, $5); }
| value NOT BETWEEN value_between AND value_between %prec BETWEEN
: value BETWEEN value AND value %prec BETWEEN
{
$$ = newNode<ComparativeBoolNode>(blr_between, $1, $3, $5);
}
| value NOT BETWEEN value AND value %prec BETWEEN
{
ComparativeBoolNode* node = newNode<ComparativeBoolNode>(blr_between, $1, $4, $6);
$$ = newNode<NotBoolNode>(node);
}
;
// Special value for BETWEEN, to avoid conflicts with boolean expressions.
%type <valueExprNode> value_between
value_between
: value_primary
| '(' boolean_value_expression ')' { $$ = newNode<BoolAsValueNode>($2); }
;
%type <boolExprNode> binary_pattern_predicate
binary_pattern_predicate
: value binary_pattern_operator value %prec CONTAINING
@ -6731,21 +6726,21 @@ nonparenthesized_value
{ $$ = $1; }
| udf
{ $$ = $1; }
| '-' value_primary %prec UMINUS
| '-' value %prec UMINUS
{ $$ = newNode<NegateNode>($2); }
| '+' value_primary %prec UPLUS
| '+' value %prec UPLUS
{ $$ = $2; }
| value_primary '+' value_primary
| value '+' value
{ $$ = newNode<ArithmeticNode>(blr_add, (client_dialect < SQL_DIALECT_V6_TRANSITION), $1, $3); }
| value_primary CONCATENATE value_primary
| value CONCATENATE value
{ $$ = newNode<ConcatenateNode>($1, $3); }
| value_primary COLLATE symbol_collation_name
| value COLLATE symbol_collation_name
{ $$ = newNode<CollateNode>($1, *$3); }
| value_primary '-' value_primary
| value '-' value
{ $$ = newNode<ArithmeticNode>(blr_subtract, (client_dialect < SQL_DIALECT_V6_TRANSITION), $1, $3); }
| value_primary '*' value_primary
| value '*' value
{ $$ = newNode<ArithmeticNode>(blr_multiply, (client_dialect < SQL_DIALECT_V6_TRANSITION), $1, $3); }
| value_primary '/' value_primary
| value '/' value
{ $$ = newNode<ArithmeticNode>(blr_divide, (client_dialect < SQL_DIALECT_V6_TRANSITION), $1, $3); }
| '(' column_singleton ')'
{ $$ = $2; }