create table implemented version 2

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java

@@ -27,6 +27,7 @@
 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.Select;
 import net.sf.jsqlparser.statement.select.SelectBody;
 
 /**
@@ -38,7 +39,7 @@ public class CreateTable implements Statement {
     private List<String> tableOptionsStrings;
     private List<ColumnDefinition> columnDefinitions;
     private List<Index> indexes;
-    private SelectBody selectBody;
+    private Select select;
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
@@ -92,12 +93,12 @@ public void setIndexes(List<Index> list) {
         indexes = list;
     }
 
-    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;
     }
 
     @Override
@@ -106,8 +107,8 @@ public String toString() {
 
         sql = "CREATE TABLE " + table;
 
-        if (selectBody != null) {
-            sql += " AS " + selectBody.toString();
+        if (select != null) {
+            sql += " AS " + select.toString();
         } else {
             sql += " (";
 

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

@@ -44,8 +44,8 @@ public CreateTableDeParser(StringBuilder buffer) {
 
     public void deParse(CreateTable createTable) {
         buffer.append("CREATE TABLE ").append(createTable.getTable().getFullyQualifiedName());
-        if (createTable.getSelectBody() != null) {
-            buffer.append(" AS ").append(createTable.getSelectBody().toString());
+        if (createTable.getSelect() != null) {
+            buffer.append(" AS ").append(createTable.getSelect().toString());
         } else {
             if (createTable.getColumnDefinitions() != null) {
                 buffer.append(" (");

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

@@ -2028,7 +2028,7 @@ CreateTable CreateTable():
 	ForeignKeyIndex fkIndex = null;
 	String parameter = null;
 	Table fkTable = null;
-    SelectBody select = null;
+    Select select = null;
 }
 {
 	<K_CREATE>
@@ -2150,7 +2150,7 @@ CreateTable CreateTable():
         )
         |
         (
-        <K_AS> select = SelectBody() { createTable.setSelectBody(select); }
+        <K_AS> select = Select() { createTable.setSelect(select); }
         )
 	]
 

src/test/java/net/sf/jsqlparser/test/create/CreateTableTest.java

@@ -40,6 +40,11 @@ public void testCreateTableAsSelect() throws JSQLParserException {
 		String statement = "CREATE TABLE a AS SELECT col1, col2 FROM b";
 		assertSqlCanBeParsedAndDeparsed(statement);
 	}
+    
+    public void testCreateTableAsSelect2() throws JSQLParserException {
+		String statement = "CREATE TABLE newtable AS WITH a AS (SELECT col1, col3 FROM testtable) SELECT col1, col2, col3 FROM b INNER JOIN a ON b.col1 = a.col1";
+		assertSqlCanBeParsedAndDeparsed(statement);
+	}
 
 	public void testCreateTable() throws JSQLParserException {
 		String statement = "CREATE TABLE mytab (mycol a (10, 20) c nm g, mycol2 mypar1 mypar2 (23,323,3) asdf ('23','123') dasd, "