Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,12 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
return kind == K_RETURNING || kind == K_ABSENT && getToken(2).kind == K_ON;
}

private Expression prattArithRest(Expression left, Token first) throws ParseException {
// MySQL has separate lower tiers for | and &.
int arithFloor = Dialect.MYSQL.name().equals(getAsString(Feature.dialect)) ? 2 : 4;
return prattArithRest(left, first, arithFloor);
}

protected Expression prattArithRest(Expression left, Token first, int minPrec) throws ParseException {
while (!interrupted) {
Token t = getToken(1);
Expand Down Expand Up @@ -16615,7 +16621,7 @@ Expression Between(Expression leftExpression) :
)
]
(
LOOKAHEAD({ isParenthesedSelectAhead() }) betweenExpressionStart = ParenthesedSelect()
LOOKAHEAD({ isParenthesedSelectAhead() }) betweenExpressionStart = BetweenSubqueryBound()
|
betweenExpressionStart = SimpleExpression()
[
Expand All @@ -16635,7 +16641,7 @@ Expression Between(Expression leftExpression) :

<K_AND>
(
LOOKAHEAD({ isParenthesedSelectAhead() }) betweenExpressionEnd = ParenthesedSelect()
LOOKAHEAD({ isParenthesedSelectAhead() }) betweenExpressionEnd = BetweenSubqueryBound()
|
betweenExpressionEnd = SimpleExpression()
[
Expand All @@ -16662,6 +16668,16 @@ Expression Between(Expression leftExpression) :
}
}

Expression BetweenSubqueryBound() :
{
Token first = getToken(1);
Expression bound;
}
{
bound = ParenthesedSelect()
{ return prattArithRest(bound, first); }
}

Expression LikeExpression(Expression leftExpression) #LikeExpression:
{
LikeExpression result = new LikeExpression();
Expand Down Expand Up @@ -17122,12 +17138,7 @@ Expression SimpleExpression():
{ first = getToken(1); }
retval=PrimaryExpression()
// PostgreSQL path operators bind below arithmetic and above comparisons.
// MySQL also gives | and & their own tiers below <<, >>, so the loop's
// entry floor drops to 2 there instead of the shared bitwise level 4.
{
int arithFloor = Dialect.MYSQL.name().equals(getAsString(Feature.dialect)) ? 2 : 4;
retval = prattArithRest(retval, first, arithFloor);
}
{ retval = prattArithRest(retval, first); }
{
if (user != null) {
VariableAssignment assignment = new VariableAssignment();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@
package net.sf.jsqlparser.expression.operators.relational;

import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
import net.sf.jsqlparser.expression.operators.arithmetic.Subtraction;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
import net.sf.jsqlparser.statement.select.PlainSelect;
import net.sf.jsqlparser.test.TestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static org.junit.jupiter.api.Assertions.*;

Expand All @@ -26,6 +31,31 @@ void testBetweenWithAdditionIssue1948() throws JSQLParserException {
TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
}

@ParameterizedTest
@ValueSource(strings = {
"SELECT 1 FROM t WHERE d BETWEEN (SELECT m FROM x) - 1 AND (SELECT m FROM x)",
"SELECT 1 FROM t WHERE d BETWEEN (SELECT m FROM x) - INTERVAL '7 days' AND now()"
})
void testBetweenWithSubqueryArithmeticInLowerBoundIssue2944(String sql)
throws JSQLParserException {
PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sql, true);
Between between = assertInstanceOf(Between.class, select.getWhere());
Subtraction lower =
assertInstanceOf(Subtraction.class, between.getBetweenExpressionStart());
assertInstanceOf(ParenthesedSelect.class, lower.getLeftExpression());
}

@Test
void testBetweenWithSubqueryArithmeticInUpperBoundIssue2944() throws JSQLParserException {
String sql =
"SELECT 1 FROM t WHERE d BETWEEN (SELECT m FROM x) AND (SELECT m FROM x) + 1";
PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sql, true);
Between between = assertInstanceOf(Between.class, select.getWhere());
assertInstanceOf(ParenthesedSelect.class, between.getBetweenExpressionStart());
Addition upper = assertInstanceOf(Addition.class, between.getBetweenExpressionEnd());
assertInstanceOf(ParenthesedSelect.class, upper.getLeftExpression());
}

@Test
void testBetweenSymmetricIssue2250() throws JSQLParserException {
String sqlStr =
Expand Down
Loading