introduces Interval expression

Author: wumpz

README.md

@@ -7,6 +7,14 @@ Original project websites:
 * http://jsqlparser.sourceforge.net
 * http://sourceforge.net/projects/jsqlparser/
 
+## Extensions Version 0.8.4
+
+* Added support for simple intervals
+
+```sql
+select 5 - INTERVAL '45 MINUTE' from mytable
+```
+
 ## Extensions Version 0.8.3
 
 * Added support for cross join 

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

@@ -134,4 +134,6 @@ public interface ExpressionVisitor {
 	public void visit(AnalyticExpression aexpr);
 
 	public void visit(ExtractExpression eexpr);
+	
+	public void visit(IntervalExpression iexpr);
 }

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

@@ -0,0 +1,66 @@
+/*
+ * #%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%
+ */
+/*
+ * Copyright (C) 2013 JSQLParser.
+ *
+ * This library 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 library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package net.sf.jsqlparser.expression;
+
+/**
+ *
+ * @author wumpz
+ */
+public class IntervalExpression implements Expression {
+	private String parameter = null;
+
+	public String getParameter() {
+		return parameter;
+	}
+
+	public void setParameter(String parameter) {
+		this.parameter = parameter;
+	}
+	
+	@Override
+	public String toString() {
+		return "INTERVAL " + parameter;
+	}
+
+	@Override
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
+}

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

@@ -36,6 +36,7 @@
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.expression.ExtractExpression;
 import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.expression.IntervalExpression;
 import net.sf.jsqlparser.expression.InverseExpression;
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.expression.LongValue;
@@ -493,4 +494,8 @@ private void init() {
 		otherItemNames = new ArrayList<String>();
 		tables = new ArrayList<String>();
 	}
+
+	@Override
+	public void visit(IntervalExpression iexpr) {
+	}
 }

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

@@ -35,6 +35,7 @@
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.expression.ExtractExpression;
 import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.expression.IntervalExpression;
 import net.sf.jsqlparser.expression.InverseExpression;
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.expression.LongValue;
@@ -505,4 +506,9 @@ public void visit(MultiExpressionList multiExprList) {
 			}
 		}
 	}
+
+	@Override
+	public void visit(IntervalExpression iexpr) {
+		buffer.append(iexpr.toString());
+	}
 }

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -64,6 +64,7 @@ import net.sf.jsqlparser.expression.DoubleValue;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.InverseExpression;
+import net.sf.jsqlparser.expression.IntervalExpression;
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.DateValue;
@@ -239,6 +240,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_EXTRACT:"EXTRACT">
 |	<K_LATERAL:"LATERAL">
 |	<K_MATERIALIZED:"MATERIALIZED">
+|   <K_INTERVAL:"INTERVAL">
 }
 
 
@@ -1534,8 +1536,8 @@ Expression PrimaryExpression():
 	| 	"{t" token=<S_CHAR_LITERAL> "}" { retval = new TimeValue(token.image); }
 
 	| 	"{ts" token=<S_CHAR_LITERAL> "}" { retval = new TimestampValue(token.image); }
-	
-	
+
+	| retval = IntervalExpression()
 )
 
 [ "::" type=ColDataType() { 
@@ -1554,6 +1556,17 @@ Expression PrimaryExpression():
     }
 }
 
+IntervalExpression IntervalExpression() : {
+	IntervalExpression interval = new IntervalExpression();
+	Token token;
+}
+{
+	<K_INTERVAL> token=<S_CHAR_LITERAL> { interval.setParameter(token.image); }
+	{
+		return interval;
+	}
+}
+
 AnalyticExpression AnalyticExpression() :
 {
 	AnalyticExpression retval = new AnalyticExpression();

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

@@ -9,11 +9,13 @@
 import net.sf.jsqlparser.expression.DoubleValue;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.expression.IntervalExpression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.TimeValue;
 import net.sf.jsqlparser.expression.TimestampValue;
 import net.sf.jsqlparser.expression.operators.arithmetic.Multiplication;
+import net.sf.jsqlparser.expression.operators.arithmetic.Subtraction;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
@@ -30,9 +32,6 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import net.sf.jsqlparser.statement.select.SetOperationList;
-import net.sf.jsqlparser.util.deparser.ExpressionDeParser;
-import net.sf.jsqlparser.util.deparser.SelectDeParser;
-import net.sf.jsqlparser.util.deparser.StatementDeParser;
 import org.apache.commons.io.IOUtils;
 import static net.sf.jsqlparser.test.TestUtils.*;
 
@@ -952,4 +951,37 @@ public void testValues6BothVariants() throws JSQLParserException {
 		String stmt = "SELECT I FROM (VALUES 1, 2, 3) AS MY_TEMP_TABLE(I) WHERE I IN (SELECT * FROM (VALUES 1, 2) AS TEST)";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testInterval1() throws JSQLParserException {
+		String stmt = "SELECT 5 + INTERVAL '3 days'";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	public void testInterval2() throws JSQLParserException {
+		String stmt = "SELECT to_timestamp(to_char(now() - INTERVAL '45 MINUTE', 'YYYY-MM-DD-HH24:')) AS START_TIME FROM tab1";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+		
+		Statement st = CCJSqlParserUtil.parse(stmt);
+		Select select = (Select) st;
+		PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+		
+		assertEquals(1, plainSelect.getSelectItems().size());
+		SelectExpressionItem item = (SelectExpressionItem) plainSelect.getSelectItems().get(0);
+		Function function = (Function)item.getExpression();
+		
+		assertEquals("to_timestamp", function.getName());
+		
+		assertEquals(1, function.getParameters().getExpressions().size());
+		
+		Function func2 = (Function) function.getParameters().getExpressions().get(0);
+		
+		assertEquals("to_char", func2.getName());
+		
+		assertEquals(2, func2.getParameters().getExpressions().size());
+		Subtraction sub = (Subtraction) func2.getParameters().getExpressions().get(0);
+		assertTrue(sub.getRightExpression() instanceof IntervalExpression);
+		IntervalExpression iexpr = (IntervalExpression) sub.getRightExpression();
+		
+		assertEquals("'45 MINUTE'", iexpr.getParameter());
+	}
 }