TableFunction extends FunctionItem

Author: tfedkiv

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

@@ -21,56 +21,13 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import net.sf.jsqlparser.expression.Alias;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-
-public class TableFunction implements FromItem {
-
-    private String name;
-    private ExpressionList parameters;
-    private Alias alias;
-
-    /**
-     * The name of he procedure, i.e. "UNWIND_TOP"
-     *
-     * @return the name of he procedure
-     */
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String string) {
-        name = string;
-    }
-
-    /**
-     * The list of parameters of the tableFunction (if any, else null)
-     *
-     * @return the list of parameters of the tableFunction (if any, else null)
-     */
-    public ExpressionList getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(ExpressionList list) {
-        parameters = list;
-    }
+public class TableFunction extends FunctionItem implements FromItem {
 
     @Override
     public void accept(FromItemVisitor fromItemVisitor) {
         fromItemVisitor.visit(this);
     }
 
-    @Override
-    public Alias getAlias() {
-        return alias;
-    }
-
-    @Override
-    public void setAlias(Alias alias) {
-        this.alias = alias;
-    }
-
     @Override
     public Pivot getPivot() {
         return null;
@@ -79,22 +36,4 @@ public Pivot getPivot() {
     @Override
     public void setPivot(Pivot pivot) {
     }
-    
-    @Override
-    public String toString() {
-        String params;
-
-        if (parameters != null) {
-            params = parameters.toString();
-        }else {
-            params = "()";
-        }
-
-        String string = name + "" + params + "";
-        if (alias != null) {
-            string += alias.toString();
-        }
-        return string;
-    }
-
-}
+}

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

@@ -2419,19 +2419,14 @@ MySQLGroupConcat MySQLGroupConcat():{
 
 TableFunction TableFunction():
 {
-    TableFunction retval = new TableFunction();
-    String procName = null;
-    ExpressionList expressionList = null;
+    Alias alias = null;
+    Function function;
+    TableFunction functionItem;
 }
 {
-    procName=RelObjectNameExt()
-    "(" [ expressionList=SimpleExpressionList() ] ")"
-
-    {
-        retval.setParameters(expressionList);
-        retval.setName(procName);
-        return retval;
-    }
+    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

@@ -2013,8 +2013,10 @@ public void testTableFunctionWithNoParams() throws Exception {
 
         assertTrue(plainSelect.getFromItem() instanceof TableFunction);
         TableFunction fromItem = (TableFunction) plainSelect.getFromItem();
-        assertEquals("SOME_FUNCTION", fromItem.getName());
-        assertNull(fromItem.getParameters());
+        Function function = fromItem.getFunction();
+        assertNotNull(function);
+        assertEquals("SOME_FUNCTION", function.getName());
+        assertNull(function.getParameters());
         assertNull(fromItem.getAlias());
         assertStatementCanBeDeparsedAs(select, statement);
     }
@@ -2026,11 +2028,13 @@ public void testTableFunctionWithParams() throws Exception {
 
         assertTrue(plainSelect.getFromItem() instanceof TableFunction);
         TableFunction fromItem = (TableFunction) plainSelect.getFromItem();
-        assertEquals("SOME_FUNCTION", fromItem.getName());
+        Function function = fromItem.getFunction();
+        assertNotNull(function);
+        assertEquals("SOME_FUNCTION", function.getName());
 
         // verify params
-        assertNotNull(fromItem.getParameters());
-        List<Expression> expressions = fromItem.getParameters().getExpressions();
+        assertNotNull(function.getParameters());
+        List<Expression> expressions = function.getParameters().getExpressions();
         assertEquals(2, expressions.size());
 
         Expression firstParam = expressions.get(0);
@@ -2054,9 +2058,11 @@ public void testTableFunctionWithAlias() throws Exception {
 
         assertTrue(plainSelect.getFromItem() instanceof TableFunction);
         TableFunction fromItem = (TableFunction) plainSelect.getFromItem();
+        Function function = fromItem.getFunction();
+        assertNotNull(function);
 
-        assertEquals("SOME_FUNCTION", fromItem.getName());
-        assertNull(fromItem.getParameters());
+        assertEquals("SOME_FUNCTION", function.getName());
+        assertNull(function.getParameters());
         assertNotNull(fromItem.getAlias());
         assertEquals("z", fromItem.getAlias().getName());
         assertStatementCanBeDeparsedAs(select, statement);