From c883920a1175ffc02e585dd4ea023620d65f0233 Mon Sep 17 00:00:00 2001 From: Andreas Reichel Date: Fri, 22 Mar 2024 09:16:26 +0700 Subject: [PATCH] fix: parsing `SelectItem` shall support `Xor` - fixes #1980 Signed-off-by: Andreas Reichel --- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 2 +- .../jsqlparser/expression/operators/XorTest.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/test/java/net/sf/jsqlparser/expression/operators/XorTest.java diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index e26eb773e..3498af629 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -2476,7 +2476,7 @@ SelectItem SelectItem() #SelectItem: | LOOKAHEAD(AllTableColumns()) expression = AllTableColumns() | - LOOKAHEAD( Condition() ) expression = Condition() + LOOKAHEAD( 3 ) expression = XorExpression() | LOOKAHEAD( 3 ) expression = ConcatExpression() | diff --git a/src/test/java/net/sf/jsqlparser/expression/operators/XorTest.java b/src/test/java/net/sf/jsqlparser/expression/operators/XorTest.java new file mode 100644 index 000000000..2b1434e3d --- /dev/null +++ b/src/test/java/net/sf/jsqlparser/expression/operators/XorTest.java @@ -0,0 +1,14 @@ +package net.sf.jsqlparser.expression.operators; + +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.test.TestUtils; +import org.junit.jupiter.api.Test; + +public class XorTest { + + @Test + void testXorIssue1980() throws JSQLParserException { + String sqlStr = "SELECT a or b from c"; + TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true); + } +}