- allow parenthesis around from item

- allow whitespace between bars from concat

Author: wumpz

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

@@ -29,6 +29,7 @@
 public class Parenthesis extends ASTNodeAccessImpl implements Expression {
 
     private Expression expression;
+    
     private boolean not = false;
 
     public Parenthesis() {

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

@@ -36,4 +36,6 @@ public interface FromItemVisitor {
     void visit(ValuesList valuesList);
 
     void visit(TableFunction tableFunction);
+
+    public void visit(ParenthesisFromItem aThis);
 }

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

@@ -54,4 +54,9 @@ public void visit(ValuesList valuesList) {
     public void visit(TableFunction valuesList) {
 
     }
+
+    @Override
+    public void visit(ParenthesisFromItem aThis) {
+        
+    }
 }

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

@@ -0,0 +1,79 @@
+/*
+ * #%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.statement.select;
+
+import net.sf.jsqlparser.expression.*;
+
+/**
+ * It represents an expression like "(" expression ")"
+ */
+public class ParenthesisFromItem implements FromItem {
+
+    private FromItem fromItem;
+    
+    private Alias alias;
+
+    public ParenthesisFromItem() {
+    }
+
+    public ParenthesisFromItem(FromItem fromItem) {
+        setFromItem(fromItem);
+    }
+
+    public FromItem getFromItem() {
+        return fromItem;
+    }
+
+    public final void setFromItem(FromItem fromItem) {
+        this.fromItem = fromItem;
+    }
+
+    @Override
+    public void accept(FromItemVisitor fromItemVisitor) {
+        fromItemVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + fromItem + ")" + (alias!=null?alias.toString():"");
+    }
+
+    @Override
+    public Alias getAlias() {
+        return alias;
+    }
+
+    @Override
+    public void setAlias(Alias alias) {
+        this.alias = alias;
+    }
+
+    @Override
+    public Pivot getPivot() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
+    @Override
+    public void setPivot(Pivot pivot) {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+}

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

@@ -115,6 +115,7 @@
 import net.sf.jsqlparser.statement.select.FromItemVisitor;
 import net.sf.jsqlparser.statement.select.Join;
 import net.sf.jsqlparser.statement.select.LateralSubSelect;
+import net.sf.jsqlparser.statement.select.ParenthesisFromItem;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectBody;
@@ -791,4 +792,9 @@ public void visit(Upsert upsert) {
     @Override
     public void visit(UseStatement use) {
     }
+
+    @Override
+    public void visit(ParenthesisFromItem parenthesis) {
+        parenthesis.getFromItem().accept(this);
+    }
 }

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

@@ -40,7 +40,8 @@ public SelectDeParser() {
     }
 
     /**
-     * @param expressionVisitor a {@link ExpressionVisitor} to de-parse expressions. It has to share the same<br>
+     * @param expressionVisitor a {@link ExpressionVisitor} to de-parse expressions. It has to share
+     * the same<br>
      * StringBuilder (buffer parameter) as this object in order to work
      * @param buffer the buffer that will be filled with the select
      */
@@ -280,7 +281,7 @@ public void visit(PivotXml pivot) {
     public void deparseOffset(Offset offset) {
         // OFFSET offset
         // or OFFSET offset (ROW | ROWS)
-        if (offset.getOffsetJdbcParameter()!=null) {
+        if (offset.getOffsetJdbcParameter() != null) {
             buffer.append(" OFFSET ").append(offset.getOffsetJdbcParameter());
         } else if (offset.getOffset() != 0) {
             buffer.append(" OFFSET ");
@@ -300,7 +301,7 @@ public void deparseFetch(Fetch fetch) {
         } else {
             buffer.append("NEXT ");
         }
-        if (fetch.getFetchJdbcParameter()!=null) {
+        if (fetch.getFetchJdbcParameter() != null) {
             buffer.append(fetch.getFetchJdbcParameter().toString());
         } else {
             buffer.append(fetch.getRowCount());
@@ -329,7 +330,7 @@ public void setExpressionVisitor(ExpressionVisitor visitor) {
     public void visit(SubJoin subjoin) {
         buffer.append("(");
         subjoin.getLeft().accept(this);
-        for(Join join : subjoin.getJoinList()) {
+        for (Join join : subjoin.getJoinList()) {
             deparseJoin(join);
         }
         buffer.append(")");
@@ -452,4 +453,14 @@ public void visit(AllColumns allColumns) {
     public void visit(TableFunction tableFunction) {
         buffer.append(tableFunction.toString());
     }
+
+    @Override
+    public void visit(ParenthesisFromItem parenthesis) {
+        buffer.append("(");
+        parenthesis.getFromItem().accept(this);
+        buffer.append(")");
+        if (parenthesis.getAlias() != null) {
+            buffer.append(parenthesis.getAlias().toString());
+        }
+    }
 }

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

@@ -301,7 +301,8 @@ TOKEN : /* Operators */
     <OP_GREATERTHANEQUALS: ">" (<WHITESPACE>)* "=">
 |    <OP_MINORTHANEQUALS: "<" (<WHITESPACE>)* "=">
 |    <OP_NOTEQUALSSTANDARD: "<" (<WHITESPACE>)* ">">
-|    <OP_NOTEQUALSBANG: "!=">
+|    <OP_NOTEQUALSBANG: "!" (<WHITESPACE>)* "=">
+|    <OP_CONCAT: "|" (<WHITESPACE>)* "|">
 }
 
 TOKEN : /* Date/Time with time zones */
@@ -1474,7 +1475,11 @@ FromItem FromItem():
                         LOOKAHEAD(SubJoin())
                         fromItem=SubJoin()
                         |
+                        LOOKAHEAD(3)
                         fromItem=SubSelect()
+                        |
+                        fromItem=FromItem()
+                          { fromItem = new ParenthesisFromItem(fromItem); }
                         )
                     ")"
                 )
@@ -2304,8 +2309,8 @@ Expression ConcatExpression():
 }
 {
     leftExpression=BitwiseAndOr()  { result = leftExpression; }
-    (LOOKAHEAD(2)
-        "||"
+    (LOOKAHEAD(3)
+        <OP_CONCAT>  /* Oracle allows space between the bars. */
         rightExpression=BitwiseAndOr()
         {
             Concat binExp = new Concat();

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

@@ -18,7 +18,7 @@
 
 public class SelectTest extends TestCase {
 
-    private CCJSqlParserManager parserManager = new CCJSqlParserManager();
+    private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
 
     public SelectTest(String arg0) {
         super(arg0);
@@ -2768,4 +2768,16 @@ public void testIssue584MySQLValueListExpression() throws JSQLParserException {
     public void testIssue588NotNull() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE col1 ISNULL");
     }
+    
+    public void testParenthesisAroundFromItem() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM (mytable)");
+    }
+    
+    public void testParenthesisAroundFromItem2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM (mytable myalias)");
+    }
+    
+    public void testParenthesisAroundFromItem3() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM (mytable) myalias");
+    }
 }

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

@@ -77,7 +77,7 @@ public void testAllSqlsParseDeparse() throws IOException {
 
         LOG.
                 log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success});
-        assertTrue(success >= 140);
+        assertTrue(success >= 141);
     }
 
     @Test