Merge origin/master

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java

@@ -34,4 +34,6 @@ public interface FromItemVisitor {
 	void visit(LateralSubSelect lateralSubSelect);
 
 	void visit(ValuesList valuesList);
+
+	void visit(TableFunction tableFunction);
 }

src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java

@@ -48,4 +48,9 @@ public void visit(LateralSubSelect lateralSubSelect) {
     public void visit(ValuesList valuesList) {
 
     }
+
+    @Override
+    public void visit(TableFunction valuesList) {
+
+    }
 }

src/main/java/net/sf/jsqlparser/statement/select/TableFunction.java

@@ -0,0 +1,39 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2015 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.statement.select;
+
+public class TableFunction extends FunctionItem implements FromItem {
+
+    @Override
+    public void accept(FromItemVisitor fromItemVisitor) {
+        fromItemVisitor.visit(this);
+    }
+
+    @Override
+    public Pivot getPivot() {
+        return null;
+    }
+
+    @Override
+    public void setPivot(Pivot pivot) {
+    }
+}

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

@@ -640,4 +640,8 @@ public void visit(Merge merge) {
     public void visit(OracleHint hint) {
     }
 
+    @Override
+    public void visit(TableFunction valuesList) {
+    }
+
 }

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

@@ -420,4 +420,9 @@ public void visit(ValuesList valuesList) {
     public void visit(AllColumns allColumns) {
         buffer.append('*');
     }
+
+    @Override
+    public void visit(TableFunction tableFunction) {
+        buffer.append(tableFunction.toString());
+    }
 }

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

@@ -1100,6 +1100,9 @@ FromItem FromItem():
 					")"
 				)
 				|
+				LOOKAHEAD(TableFunction())
+				fromItem=TableFunction()
+				|
 				fromItem=Table()
                 |
 				fromItem=LateralSubSelect()
@@ -2414,6 +2417,17 @@ MySQLGroupConcat MySQLGroupConcat():{
     }
 }
 
+TableFunction TableFunction():
+{
+    Alias alias = null;
+    Function function;
+    TableFunction functionItem;
+}
+{
+    function=Function() { functionItem = new TableFunction(); functionItem.setFunction(function); }
+             [alias=Alias() { functionItem.setAlias(alias); }]
+    { return functionItem; }
+}
 
 SubSelect SubSelect():
 {

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

@@ -2005,5 +2005,66 @@ public void testOracleHintExpression() throws JSQLParserException {
         PlainSelect plainSelect = (PlainSelect) ((Select) parsed).getSelectBody();
         assertExpressionCanBeDeparsedAs(plainSelect.getOracleHint(), "--+ HINT\n");
     }
-        
+
+    public void testTableFunctionWithNoParams() throws Exception {
+        final String statement = "SELECT f2 FROM SOME_FUNCTION()";
+        Select select = (Select) parserManager.parse(new StringReader(statement));
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+
+        assertTrue(plainSelect.getFromItem() instanceof TableFunction);
+        TableFunction fromItem = (TableFunction) plainSelect.getFromItem();
+        Function function = fromItem.getFunction();
+        assertNotNull(function);
+        assertEquals("SOME_FUNCTION", function.getName());
+        assertNull(function.getParameters());
+        assertNull(fromItem.getAlias());
+        assertStatementCanBeDeparsedAs(select, statement);
+    }
+
+    public void testTableFunctionWithParams() throws Exception {
+        final String statement = "SELECT f2 FROM SOME_FUNCTION(1, 'val')";
+        Select select = (Select) parserManager.parse(new StringReader(statement));
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+
+        assertTrue(plainSelect.getFromItem() instanceof TableFunction);
+        TableFunction fromItem = (TableFunction) plainSelect.getFromItem();
+        Function function = fromItem.getFunction();
+        assertNotNull(function);
+        assertEquals("SOME_FUNCTION", function.getName());
+
+        // verify params
+        assertNotNull(function.getParameters());
+        List<Expression> expressions = function.getParameters().getExpressions();
+        assertEquals(2, expressions.size());
+
+        Expression firstParam = expressions.get(0);
+        assertNotNull(firstParam);
+        assertTrue(firstParam instanceof LongValue);
+        assertEquals(1l, ((LongValue) firstParam).getValue());
+
+        Expression secondParam = expressions.get(1);
+        assertNotNull(secondParam);
+        assertTrue(secondParam instanceof StringValue);
+        assertEquals("val", ((StringValue) secondParam).getValue());
+
+        assertNull(fromItem.getAlias());
+        assertStatementCanBeDeparsedAs(select, statement);
+    }
+
+    public void testTableFunctionWithAlias() throws Exception {
+        final String statement = "SELECT f2 FROM SOME_FUNCTION() AS z";
+        Select select = (Select) parserManager.parse(new StringReader(statement));
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+
+        assertTrue(plainSelect.getFromItem() instanceof TableFunction);
+        TableFunction fromItem = (TableFunction) plainSelect.getFromItem();
+        Function function = fromItem.getFunction();
+        assertNotNull(function);
+
+        assertEquals("SOME_FUNCTION", function.getName());
+        assertNull(function.getParameters());
+        assertNotNull(fromItem.getAlias());
+        assertEquals("z", fromItem.getAlias().getName());
+        assertStatementCanBeDeparsedAs(select, statement);
+    }
 }