Merge origin/master

Author: wumpz

README.md

@@ -34,20 +34,21 @@ JSqlParser is a SQL statement parser. It translates SQLs in a traversable hierar
 If you need help using JSqlParser feel free to file an issue or contact me.
 
 ## Contributions
-To help JSqlParsers development you are encouraged to provide 
+To help JSqlParser's development you are encouraged to provide 
 * feedback
 * bugreports
 * pull requests for new features
 * improvement requests
 * fund new features
 * a little donation
 
-**Please write in english, since it's the language most of the dev team knows.**
+**Please write in English, since it's the language most of the dev team knows.**
 
 Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 1.3
 
+* support for **with - selects** statements in **create view** definitions
 * support for block statements (begin ... end)
 * support for additional raw string and byte prefixes (issue #659)
 * support for special oracle type syntax **varchar2(255 BYTE)** (issue #273) 
@@ -64,7 +65,7 @@ Also I would like to know about needed examples or documentation stuff.
 ## Extensions of JSqlParser releases
 
 * [Release Notes](https://github.com/JSQLParser/JSqlParser/releases)
-* Modifications before GitHubs release tagging are listed in the [Older Releases](https://github.com/JSQLParser/JSqlParser/wiki/Older-Releases) page.
+* Modifications before GitHub's release tagging are listed in the [Older Releases](https://github.com/JSQLParser/JSqlParser/wiki/Older-Releases) page.
 
 
 ## Building from the sources
@@ -79,7 +80,7 @@ The project requires the following to build:
 
 This will produce the jsqlparser-VERSION.jar file in the target/ directory.
 
-**To build this project without using Maven, one has to build the parser by JavaCC using the CLI options it provids.**
+**To build this project without using Maven, one has to build the parser by JavaCC using the CLI options it provides.**
 
 ## Debugging through problems
 

src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java

@@ -26,15 +26,15 @@
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectBody;
+import net.sf.jsqlparser.statement.select.Select;
 
 /**
  * A "CREATE VIEW" statement
  */
 public class CreateView implements Statement {
 
     private Table view;
-    private SelectBody selectBody;
+    private Select select;
     private boolean orReplace = false;
     private List<String> columnNames = null;
     private boolean materialized = false;
@@ -73,15 +73,12 @@ public void setOrReplace(boolean orReplace) {
         this.orReplace = orReplace;
     }
 
-    /**
-     * @return the SelectBody
-     */
-    public SelectBody getSelectBody() {
-        return selectBody;
+    public Select getSelect() {
+        return select;
     }
 
-    public void setSelectBody(SelectBody selectBody) {
-        this.selectBody = selectBody;
+    public void setSelect(Select select) {
+        this.select = select;
     }
 
     public List<String> getColumnNames() {
@@ -143,7 +140,7 @@ public String toString() {
         if (columnNames != null) {
             sql.append(PlainSelect.getStringList(columnNames, true, true));
         }
-        sql.append(" AS ").append(selectBody);
+        sql.append(" AS ").append(select);
         return sql.toString();
     }
 }

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

@@ -24,7 +24,9 @@
 import net.sf.jsqlparser.statement.create.view.CreateView;
 import net.sf.jsqlparser.statement.create.view.TemporaryOption;
 import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
+import net.sf.jsqlparser.statement.select.WithItem;
 
 /**
  * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
@@ -77,7 +79,22 @@ public void deParse(CreateView createView) {
         }
         buffer.append(" AS ");
 
-        createView.getSelectBody().accept(selectVisitor);
+        Select select = createView.getSelect();
+        if (select.getWithItemsList() != null) {
+            buffer.append("WITH ");
+            boolean first = true;
+            for (WithItem item : select.getWithItemsList()) {
+                if (!first) {
+                    buffer.append(", ");
+                } else {
+                    first = false;
+                }
+
+                item.accept(selectVisitor);
+            }
+            buffer.append(" ");
+        }
+        createView.getSelect().getSelectBody().accept(selectVisitor);
     }
 
     public StringBuilder getBuffer() {

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

@@ -3276,7 +3276,7 @@ CreateView CreateView():
 {
     CreateView createView = new CreateView();
     Table view = null;
-    SelectBody select = null;
+    Select select = null;
     List<String> columnNames = null;
 }
 {
@@ -3294,7 +3294,7 @@ CreateView CreateView():
     <K_VIEW> view=Table() { createView.setView(view); }
     [ columnNames = ColumnsNamesList() { createView.setColumnNames(columnNames); } ]
     <K_AS>
-    select=SelectBody() { createView.setSelectBody(select); }
+    select=Select() { createView.setSelect(select); }
     { return createView; }
 }
 

src/test/java/net/sf/jsqlparser/statement/create/CreateViewTest.java

@@ -1,7 +1,6 @@
 package net.sf.jsqlparser.statement.create;
 
 import java.io.StringReader;
-
 import junit.framework.TestCase;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserManager;
@@ -23,8 +22,7 @@ public void testCreateView() throws JSQLParserException {
         CreateView createView = (CreateView) parserManager.parse(new StringReader(statement));
         assertFalse(createView.isOrReplace());
         assertEquals("myview", createView.getView().getName());
-        assertEquals("mytab", ((Table) ((PlainSelect) createView.getSelectBody()).getFromItem()).
-                getName());
+        assertEquals("mytab", ((Table) ((PlainSelect) createView.getSelect().getSelectBody()).getFromItem()).getName());
         assertEquals(statement, createView.toString());
     }
 
@@ -54,7 +52,7 @@ public void testCreateView5() throws JSQLParserException {
         CreateView createView = (CreateView) parserManager.parse(new StringReader(statement));
         assertFalse(createView.isOrReplace());
         assertEquals("myview", createView.getView().getName());
-        assertEquals("mytab", ((Table) ((PlainSelect) createView.getSelectBody()).getFromItem()).
+        assertEquals("mytab", ((Table) ((PlainSelect) createView.getSelect().getSelectBody()).getFromItem()).
                 getName());
         assertEquals(statement2, createView.toString());
     }
@@ -92,4 +90,8 @@ public void testCreateTemporaryViewIssue604() throws JSQLParserException {
     public void testCreateTemporaryViewIssue604_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TEMP VIEW myview AS SELECT * FROM mytable");
     }
+
+    public void testCreateTemporaryViewIssue665() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE VIEW foo(\"BAR\") AS WITH temp AS (SELECT temp_bar FROM foobar) SELECT bar FROM temp");
+    }
 }