Add support old oracle join syntax to more expressions (simple comparisons and IN)

Author: Jonathan Burnhams

src/main/java/net/sf/jsqlparser/expression/operators/relational/EqualsTo.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class EqualsTo extends BinaryExpression {
+public class EqualsTo extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {
@@ -35,24 +34,4 @@ public void accept(ExpressionVisitor expressionVisitor) {
 	public String getStringExpression() {
 		return "=";
 	}
-	public static final int NO_ORACLE_JOIN = 0;
-	public static final int ORACLE_JOIN_RIGHT = 1;
-	public static final int ORACLE_JOIN_LEFT = 2;
-	private int oldOracleJoinSyntax = NO_ORACLE_JOIN;
-
-	public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {
-		this.oldOracleJoinSyntax = oldOracleJoinSyntax;
-		if (oldOracleJoinSyntax < 0 || oldOracleJoinSyntax > 2) {
-			throw new IllegalArgumentException("unknown join type for oracle found (type=" + oldOracleJoinSyntax + ")");
-		}
-	}
-
-	@Override
-	public String toString() {
-		return (isNot() ? "NOT " : "") + getLeftExpression() + (oldOracleJoinSyntax == ORACLE_JOIN_RIGHT ? "(+)" : "") + " " + getStringExpression() + " " + getRightExpression() + (oldOracleJoinSyntax == ORACLE_JOIN_LEFT ? "(+)" : "");
-	}
-
-	public int getOldOracleJoinSyntax() {
-		return oldOracleJoinSyntax;
-	}
 }

src/main/java/net/sf/jsqlparser/expression/operators/relational/GreaterThan.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class GreaterThan extends BinaryExpression {
+public class GreaterThan extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {

src/main/java/net/sf/jsqlparser/expression/operators/relational/GreaterThanEquals.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class GreaterThanEquals extends BinaryExpression {
+public class GreaterThanEquals extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {

src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java

@@ -24,13 +24,15 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class InExpression implements Expression {
+public class InExpression implements Expression, SupportsOldOracleJoinSyntax {
 
 	private Expression leftExpression;
 	private ItemsList leftItemsList;
 	private ItemsList rightItemsList;
 	private boolean not = false;
 
+    private int oldOracleJoinSyntax = NO_ORACLE_JOIN;
+
 	public InExpression() {
 	}
 
@@ -39,6 +41,17 @@ public InExpression(Expression leftExpression, ItemsList itemsList) {
 		setRightItemsList(itemsList);
 	}
 
+    public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {
+        this.oldOracleJoinSyntax = oldOracleJoinSyntax;
+        if (oldOracleJoinSyntax < 0 || oldOracleJoinSyntax > 1) {
+            throw new IllegalArgumentException("unexpected join type for oracle found with IN (type=" + oldOracleJoinSyntax + ")");
+        }
+    }
+
+    public int getOldOracleJoinSyntax() {
+        return oldOracleJoinSyntax;
+    }
+
 	public ItemsList getRightItemsList() {
 		return rightItemsList;
 	}
@@ -76,8 +89,12 @@ public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
+    private String getLeftExpressionString() {
+        return leftExpression + (oldOracleJoinSyntax == ORACLE_JOIN_RIGHT ? "(+)" : "");
+    }
+
 	@Override
 	public String toString() {
-		return (leftExpression == null ? leftItemsList : leftExpression) + " " + ((not) ? "NOT " : "") + "IN " + rightItemsList + "";
+		return (leftExpression == null ? leftItemsList : getLeftExpressionString()) + " " + ((not) ? "NOT " : "") + "IN " + rightItemsList + "";
 	}
 }

src/main/java/net/sf/jsqlparser/expression/operators/relational/Matches.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class Matches extends BinaryExpression {
+public class Matches extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {

src/main/java/net/sf/jsqlparser/expression/operators/relational/MinorThan.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class MinorThan extends BinaryExpression {
+public class MinorThan extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {

src/main/java/net/sf/jsqlparser/expression/operators/relational/MinorThanEquals.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class MinorThanEquals extends BinaryExpression {
+public class MinorThanEquals extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {

src/main/java/net/sf/jsqlparser/expression/operators/relational/NotEqualsTo.java

@@ -21,10 +21,9 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
-import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
-public class NotEqualsTo extends BinaryExpression {
+public class NotEqualsTo extends OldOracleJoinBinaryExpression {
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {

src/main/java/net/sf/jsqlparser/expression/operators/relational/OldOracleJoinBinaryExpression.java

@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression.operators.relational;
+
+import net.sf.jsqlparser.expression.BinaryExpression;
+
+public abstract class OldOracleJoinBinaryExpression extends BinaryExpression implements SupportsOldOracleJoinSyntax {
+
+    private int oldOracleJoinSyntax = NO_ORACLE_JOIN;
+
+    public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {
+        this.oldOracleJoinSyntax = oldOracleJoinSyntax;
+        if (oldOracleJoinSyntax < 0 || oldOracleJoinSyntax > 2) {
+            throw new IllegalArgumentException("unknown join type for oracle found (type=" + oldOracleJoinSyntax + ")");
+        }
+    }
+
+    @Override
+    public String toString() {
+        return (isNot() ? "NOT " : "") + getLeftExpression() + (oldOracleJoinSyntax == ORACLE_JOIN_RIGHT ? "(+)" : "") + " " + getStringExpression() + " " + getRightExpression() + (oldOracleJoinSyntax == ORACLE_JOIN_LEFT ? "(+)" : "");
+    }
+
+    public int getOldOracleJoinSyntax() {
+        return oldOracleJoinSyntax;
+    }
+}

src/main/java/net/sf/jsqlparser/expression/operators/relational/SupportsOldOracleJoinSyntax.java

@@ -0,0 +1,32 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression.operators.relational;
+
+public interface SupportsOldOracleJoinSyntax {
+    public static final int NO_ORACLE_JOIN = 0;
+    public static final int ORACLE_JOIN_RIGHT = 1;
+    public static final int ORACLE_JOIN_LEFT = 2;
+
+    public int getOldOracleJoinSyntax();
+
+    public void setOldOracleJoinSyntax(int oldOracleJoinSyntax);
+}