Merge pull request #818 from tomershay/support_div_operator

wumpz · web-flow · commit 3dee404a4fb8 · 2019-07-04T08:18:11.000+02:00
Adding support for the DIV operator
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java
@@ -9,17 +9,7 @@
  */
 package net.sf.jsqlparser.expression;
 
-import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseOr;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseRightShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseXor;
-import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
-import net.sf.jsqlparser.expression.operators.arithmetic.Division;
-import net.sf.jsqlparser.expression.operators.arithmetic.Modulo;
-import net.sf.jsqlparser.expression.operators.arithmetic.Multiplication;
-import net.sf.jsqlparser.expression.operators.arithmetic.Subtraction;
+import net.sf.jsqlparser.expression.operators.arithmetic.*;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
 import net.sf.jsqlparser.expression.operators.relational.*;
@@ -62,6 +52,8 @@ public interface ExpressionVisitor {
 
     void visit(Division division);
 
+    void visit(IntegerDivision division);
+
     void visit(Multiplication multiplication);
 
     void visit(Subtraction subtraction);
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java
@@ -115,6 +115,11 @@ public void visit(Division expr) {
         visitBinaryExpression(expr);
     }
 
+    @Override
+    public void visit(IntegerDivision expr) {
+        visitBinaryExpression(expr);
+    }
+
     @Override
     public void visit(Multiplication expr) {
         visitBinaryExpression(expr);
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/arithmetic/IntegerDivision.java b/src/main/java/net/sf/jsqlparser/expression/operators/arithmetic/IntegerDivision.java
@@ -0,0 +1,26 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression.operators.arithmetic;
+
+import net.sf.jsqlparser.expression.BinaryExpression;
+import net.sf.jsqlparser.expression.ExpressionVisitor;
+
+public class IntegerDivision extends BinaryExpression {
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String getStringExpression() {
+        return "DIV";
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -49,17 +49,7 @@
 import net.sf.jsqlparser.expression.UserVariable;
 import net.sf.jsqlparser.expression.ValueListExpression;
 import net.sf.jsqlparser.expression.WhenClause;
-import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseOr;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseRightShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseXor;
-import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
-import net.sf.jsqlparser.expression.operators.arithmetic.Division;
-import net.sf.jsqlparser.expression.operators.arithmetic.Modulo;
-import net.sf.jsqlparser.expression.operators.arithmetic.Multiplication;
-import net.sf.jsqlparser.expression.operators.arithmetic.Subtraction;
+import net.sf.jsqlparser.expression.operators.arithmetic.*;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
 import net.sf.jsqlparser.expression.operators.relational.*;
@@ -244,6 +234,11 @@ public void visit(Division division) {
         visitBinaryExpression(division);
     }
 
+    @Override
+    public void visit(IntegerDivision division) {
+        visitBinaryExpression(division);
+    }
+
     @Override
     public void visit(DoubleValue doubleValue) {
     }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -50,17 +50,7 @@
 import net.sf.jsqlparser.expression.ValueListExpression;
 import net.sf.jsqlparser.expression.WhenClause;
 import net.sf.jsqlparser.expression.WindowElement;
-import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseOr;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseRightShift;
-import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseXor;
-import net.sf.jsqlparser.expression.operators.arithmetic.Concat;
-import net.sf.jsqlparser.expression.operators.arithmetic.Division;
-import net.sf.jsqlparser.expression.operators.arithmetic.Modulo;
-import net.sf.jsqlparser.expression.operators.arithmetic.Multiplication;
-import net.sf.jsqlparser.expression.operators.arithmetic.Subtraction;
+import net.sf.jsqlparser.expression.operators.arithmetic.*;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
 import net.sf.jsqlparser.expression.operators.relational.*;
@@ -134,6 +124,11 @@ public void visit(Division division) {
         visitBinaryExpression(division, " / ");
     }
 
+    @Override
+    public void visit(IntegerDivision division) {
+        visitBinaryExpression(division, " DIV ");
+    }
+
     @Override
     public void visit(DoubleValue doubleValue) {
         buffer.append(doubleValue.toString());
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -149,6 +149,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_DESCRIBE:"DESCRIBE">
 |   <K_DISABLE : "DISABLE">
 |   <K_DISTINCT:"DISTINCT">
+|   <K_DIV:"DIV">
 |   <K_DO:"DO">
 |   <K_DOUBLE : "DOUBLE">
 |   <K_DROP:"DROP">
@@ -2733,6 +2734,7 @@ Expression MultiplicativeExpression():
     (
         LOOKAHEAD(2) ("*" { result = new Multiplication(); }
                                     | "/" { result = new Division(); }
+                                    | <K_DIV> { result = new IntegerDivision(); }
                                     | "%" { result = new Modulo(); }
                     )
 
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -1937,6 +1937,12 @@ public void testProblemSqlIntersect() throws Exception {
         assertStatementCanBeDeparsedAs(parsed, "SELECT * FROM a INTERSECT SELECT * FROM b");
     }
 
+    @Test
+    public void testIntegerDivOperator() throws Exception {
+        String stmt = "SELECT col DIV 3";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testProblemSqlExcept() throws Exception {
         String stmt = "(SELECT * FROM a) EXCEPT (SELECT * FROM b)";

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */`
`149`	`149`	`\| <K_DESCRIBE:"DESCRIBE">`
`150`	`150`	`\| <K_DISABLE : "DISABLE">`
`151`	`151`	`\| <K_DISTINCT:"DISTINCT">`
	`152`	`+\| <K_DIV:"DIV">`
`152`	`153`	`\| <K_DO:"DO">`
`153`	`154`	`\| <K_DOUBLE : "DOUBLE">`
`154`	`155`	`\| <K_DROP:"DROP">`
`@@ -2733,6 +2734,7 @@ Expression MultiplicativeExpression():`
`2733`	`2734`	`(`
`2734`	`2735`	`LOOKAHEAD(2) ("*" { result = new Multiplication(); }`
`2735`	`2736`	`\| "/" { result = new Division(); }`
	`2737`	`+ \| <K_DIV> { result = new IntegerDivision(); }`
`2736`	`2738`	`\| "%" { result = new Modulo(); }`
`2737`	`2739`	`)`
`2738`	`2740`