Closes #1604, added simple OVERLAPS support (#1611)

Author: d2a-raudenaerde

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

@@ -69,6 +69,8 @@ public interface ExpressionVisitor {
 
     void visit(Between between);
 
+    void visit (OverlapsCondition overlapsCondition);
+
     void visit(EqualsTo equalsTo);
 
     void visit(GreaterThan greaterThan);

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

@@ -161,6 +161,12 @@ public void visit(Between expr) {
         expr.getBetweenExpressionEnd().accept(this);
     }
 
+    public void visit(OverlapsCondition overlapsCondition) {
+        overlapsCondition.getLeft().accept(this);
+        overlapsCondition.getRight().accept(this);
+    }
+
+
     @Override
     public void visit(EqualsTo expr) {
         visitBinaryExpression(expr);

src/main/java/net/sf/jsqlparser/expression/OverlapsCondition.java

@@ -0,0 +1,47 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2022 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class OverlapsCondition extends ASTNodeAccessImpl implements Expression{
+
+
+    private ExpressionList left;
+    private ExpressionList right;
+
+
+    public OverlapsCondition(ExpressionList left, ExpressionList right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    public ExpressionList getLeft() {
+        return left;
+    }
+
+    public ExpressionList getRight() {
+        return right;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+            expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s OVERLAPS %s"
+                , left.toString()
+                , right.toString()
+        );
+    }
+}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -189,6 +189,12 @@ public void visit(Between between) {
         between.getBetweenExpressionEnd().accept(this);
     }
 
+    @Override
+    public void visit(OverlapsCondition overlapsCondition) {
+        overlapsCondition.getLeft().accept(this);
+        overlapsCondition.getRight().accept(this);
+    }
+
     @Override
     public void visit(Column tableColumn) {
         if (allowColumnProcessing && tableColumn.getTable() != null && tableColumn.getTable().getName() != null) {

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -107,6 +107,11 @@ public void visit(Between between) {
 
     }
 
+    @Override
+    public void visit(OverlapsCondition overlapsCondition) {
+        buffer.append(overlapsCondition.toString());
+    }
+
     @Override
     public void visit(EqualsTo equalsTo) {
         visitOldOracleJoinBinaryExpression(equalsTo, " = ");

src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java

@@ -79,6 +79,13 @@ public void visit(Between between) {
         between.getBetweenExpressionEnd().accept(this);
     }
 
+    @Override
+    public void visit(OverlapsCondition overlapsCondition) {
+        validateOptionalExpressionList(overlapsCondition.getLeft());
+        validateOptionalExpressionList(overlapsCondition.getRight());
+    }
+
+
     @Override
     public void visit(EqualsTo equalsTo) {
         visitOldOracleJoinBinaryExpression(equalsTo, " = ");

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -320,6 +320,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_OUTER:"OUTER">
 |   <K_OUTPUT:"OUTPUT">
 |   <K_OVER:"OVER">
+|   <K_OVERLAPS:"OVERLAPS">
 |   <K_OPTIMIZE: "OPTIMIZE" >
 |   <K_PARALLEL:"PARALLEL">
 |   <K_PARTITION:"PARTITION">
@@ -3307,6 +3308,20 @@ Expression Condition():
     { return not?new NotExpression(result, exclamationMarkNot):result; }
 }
 
+Expression OverlapsCondition():{
+    ExpressionList left = new ExpressionList();
+    ExpressionList right = new ExpressionList();
+}
+{
+    //As per the sql2003 standard, we need at least two items in the list if there is not explicit ROW prefix
+    //More than two expression are allowed per the sql2003 grammar.
+    "(" left = SimpleExpressionListAtLeastTwoItems() ")"
+    <K_OVERLAPS>
+    "(" right = SimpleExpressionListAtLeastTwoItems() ")"
+
+    {return new OverlapsCondition(left, right);}
+}
+
 Expression RegularCondition() #RegularCondition:
 {
     Expression result = null;
@@ -3383,6 +3398,7 @@ Expression SQLCondition():
     (
     result=ExistsExpression()
     | LOOKAHEAD(InExpression()) result=InExpression()
+    | LOOKAHEAD(OverlapsCondition()) result=OverlapsCondition()
     | left = SimpleExpression() { result = left; }
         [ LOOKAHEAD(2) ((LOOKAHEAD(2) result=Between(left)
          | LOOKAHEAD(IsNullExpression()) result=IsNullExpression(left)

src/test/java/net/sf/jsqlparser/expression/OverlapsConditionTest.java

@@ -0,0 +1,27 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2022 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Test;
+
+public class OverlapsConditionTest {
+
+    @Test
+    public void testOverlapsCondition() throws JSQLParserException {
+        TestUtils.assertExpressionCanBeParsedAndDeparsed("(t1.start, t1.end) overlaps (t2.start, t2.end)", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed("select * from dual where (start_one, end_one) overlaps (start_two, end_two)", true);
+
+        TestUtils.assertSqlCanBeParsedAndDeparsed("select * from t1 left join t2 on (t1.start, t1.end) overlaps (t2.start, t2.end)", true);
+
+    }
+}