fixes #855

Author: wumpz

README.md

@@ -66,6 +66,7 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 3.2
 
+* first support for **CREATE SCHEMA** and **DROP SCHEMA**
 * allow **ON** as a value in a set statement (`SET myvalue = ON`)
 * support for **ALTER TABLE ONLY mytable ...**
 * allow foreign key definition in alter statements without referenced columns specification

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
+import net.sf.jsqlparser.statement.create.schema.CreateSchema;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.create.view.AlterView;
 import net.sf.jsqlparser.statement.create.view.CreateView;
@@ -46,6 +47,8 @@ public interface StatementVisitor {
     void visit(Truncate truncate);
 
     void visit(CreateIndex createIndex);
+    
+    void visit(CreateSchema aThis);
 
     void visit(CreateTable createTable);
 

src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java

@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
+import net.sf.jsqlparser.statement.create.schema.CreateSchema;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.create.view.AlterView;
 import net.sf.jsqlparser.statement.create.view.CreateView;
@@ -79,6 +80,10 @@ public void visit(CreateIndex createIndex) {
 
     }
 
+    @Override
+    public void visit(CreateSchema aThis) {
+    }
+
     @Override
     public void visit(CreateTable createTable) {
 

src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java

@@ -0,0 +1,119 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.create.schema;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.StatementVisitor;
+
+public class CreateSchema implements Statement {
+
+    private String authorization;
+    private String schemaName;
+    private List<String> schemaPath;
+    private List<Statement> statements = new ArrayList<>();
+
+    @Override
+    public void accept(StatementVisitor statementVisitor) {
+        statementVisitor.visit(this);
+    }
+
+    /**
+     * Add a statement to the schema definition
+     *
+     * @param statement The statement to be added
+     * @return true if the operation was successful
+     *
+     */
+    public boolean addStatement(Statement statement) {
+        return statements.add(statement);
+    }
+
+    /**
+     * The owner of the schema.
+     *
+     * @return Owner name
+     *
+     */
+    public String getAuthorization() {
+        return authorization;
+    }
+
+    /**
+     * The name of the schema
+     *
+     * @return Schema name
+     */
+    public String getSchemaName() {
+        return schemaName;
+    }
+
+    /**
+     * The path of the schema
+     *
+     * @return Schema path
+     *
+     */
+    public List<String> getSchemaPath() {
+        return schemaPath;
+    }
+
+    /**
+     * The statements executed as part of the schema creation
+     *
+     * @return the statements
+     *
+     */
+    public List<Statement> getStatements() {
+        return statements;
+    }
+
+    /**
+     * The owner of the schems.
+     *
+     * @param authorization Owner name
+     *
+     */
+    public void setAuthorization(String authorization) {
+        this.authorization = authorization;
+    }
+
+    /**
+     * Set the name of the schema
+     *
+     * @param schemaName Schema name
+     *
+     */
+    public void setSchemaName(String schemaName) {
+        this.schemaName = schemaName;
+    }
+
+    /**
+     * Set the path of the schema
+     *
+     * @param schemaPath Schema path
+     *
+     */
+    public void setSchemaPath(List<String> schemaPath) {
+        this.schemaPath = schemaPath;
+    }
+
+    public String toString() {
+        String sql = "CREATE SCHEMA";
+        if (schemaName != null) {
+            sql += " " + schemaName;
+        }
+        if (authorization != null) {
+            sql += " AUTHORIZATION " + authorization;
+        }
+        return sql;
+    }
+}

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

@@ -71,6 +71,7 @@
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
+import net.sf.jsqlparser.statement.create.schema.CreateSchema;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.create.view.AlterView;
 import net.sf.jsqlparser.statement.create.view.CreateView;
@@ -689,6 +690,11 @@ public void visit(Truncate truncate) {
     public void visit(CreateIndex createIndex) {
         throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
     }
+    
+    @Override
+    public void visit(CreateSchema aThis) {
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
+    }
 
     @Override
     public void visit(CreateTable create) {

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

@@ -25,6 +25,7 @@
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
+import net.sf.jsqlparser.statement.create.schema.CreateSchema;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
 import net.sf.jsqlparser.statement.create.view.AlterView;
 import net.sf.jsqlparser.statement.create.view.CreateView;
@@ -274,4 +275,9 @@ public void visit(DeclareStatement declare) {
         expressionDeParser.setBuffer(buffer);
         new DeclareStatementDeParser(expressionDeParser, buffer).deParse(declare);
     }
+
+    @Override
+    public void visit(CreateSchema aThis) {
+        buffer.append(aThis.toString());
+    }
 }

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

@@ -39,6 +39,7 @@ import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.alter.*;
 import net.sf.jsqlparser.statement.comment.*;
 import net.sf.jsqlparser.statement.create.index.*;
+import net.sf.jsqlparser.statement.create.schema.*;
 import net.sf.jsqlparser.statement.create.table.*;
 import net.sf.jsqlparser.statement.create.view.*;
 import net.sf.jsqlparser.statement.delete.*;
@@ -124,6 +125,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_APPLY:"APPLY">
 |   <K_AS: "AS">
 |   <K_ASC:"ASC">
+|   <K_AUTHORIZATION:"AUTHORIZATION">
 |   <K_BEGIN:"BEGIN">
 |   <K_BETWEEN:"BETWEEN">
 |   <K_BINARY: "BINARY">  
@@ -152,6 +154,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_DECLARE: "DECLARE">
 |   <K_DATETIMELITERAL : ("DATE" | "TIME" | "TIMESTAMP") >
 |   <K_DATE_LITERAL : ( "YEAR" | "MONTH" | "DAY" | "HOUR" | "MINUTE" | "SECOND" ) >
+|   <K_DEFAULT : "DEFAULT">
 |   <K_DEFERRABLE : "DEFERRABLE">
 |   <K_DELAYED : "DELAYED">
 |   <K_DELETE:"DELETE">
@@ -266,6 +269,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_RIGHT:"RIGHT">
 |   <K_ROW: "ROW"> 
 |   <K_ROWS: "ROWS">
+|   <K_SCHEMA: "SCHEMA">
 |   <K_SELECT: ("SELECT" | "SEL")>
 |   <K_SEMI : "SEMI">
 |   <K_SEPARATOR:"SEPARATOR">
@@ -430,6 +434,9 @@ Statement SingleStatement() :
         LOOKAHEAD(CreateIndex())
         stm = CreateIndex()
         |
+        LOOKAHEAD(CreateSchema())
+        stm = CreateSchema()
+        |
         LOOKAHEAD(CreateTable())
         stm = CreateTable()
         |
@@ -1136,7 +1143,7 @@ String RelObjectNameWithoutValue() :
       | tk=<K_TEMP> | tk=<K_TEMPORARY> | tk=<K_TYPE> | tk=<K_ISNULL> 
 	  | tk=<K_ZONE> | tk=<K_COLUMNS> | tk=<K_DESCRIBE> | tk=<K_FN> | tk=<K_PATH>
       | tk=<K_DATE_LITERAL> | tk=<K_NEXTVAL> | tk=<K_TRUE> | tk=<K_FALSE> | tk=<K_DUPLICATE>
-      | tk=<K_READ> | tk=<K_SIZE> | tk=<K_SESSION>
+      | tk=<K_READ> | tk=<K_SCHEMA> | tk=<K_SIZE> | tk=<K_SESSION>
       | tk=<K_VIEW> | <K_NOLOCK>
 /*      | tk=<K_PLACING> | tk=<K_BOTH> | tk=<K_LEADING> | tk=<K_TRAILING> */
       )
@@ -3689,6 +3696,60 @@ ColumnDefinition ColumnDefinition(): {
     }
 }
 
+CreateSchema CreateSchema():
+{
+    Token tk = null;
+    CreateTable table = null;
+    CreateView view = null;
+    CreateSchema schema = new CreateSchema();
+    //schema.setSchemaName(System.getProperty("user.name"));
+    //schema.setAuthorization(System.getProperty("user.name"));
+    List<String> schemaPath = null;
+    List<Statement> statements = new ArrayList<Statement>();
+}
+{
+    <K_CREATE> <K_SCHEMA>
+    [ ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { schema.setSchemaName(tk.image); } ]
+    [ <K_AUTHORIZATION>
+        (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { schema.setAuthorization(tk.image); }
+    ]
+       
+    /* [ <K_DEFAULT> <K_CHARACTER> <K_SET> tk=<S_QUOTED_IDENTIFIER> | <S_IDENTIFIER> {} ] */
+
+    [schemaPath=PathSpecification() { schema.setSchemaPath(schemaPath); }]
+
+    (
+        LOOKAHEAD(3)
+        table = CreateTable()
+        {
+            table.getTable().setSchemaName(schema.getSchemaName());
+            schema.addStatement(table);
+        }
+        | view = CreateView()
+        {
+            view.getView().setSchemaName(schema.getSchemaName());
+            schema.addStatement(view);
+        }
+
+    )*
+    {
+        return schema;
+    }
+}
+
+List<String> PathSpecification():
+{
+    Token tk;
+    List<String> pathList = new ArrayList<String>();
+}
+{
+    <K_PATH> (tk=<S_IDENTIFIER>|tk=<S_QUOTED_IDENTIFIER>) { pathList.add(tk.image); }
+        ("," (tk=<S_IDENTIFIER>|tk=<S_QUOTED_IDENTIFIER>) { pathList.add(tk.image); })*
+    {
+        return pathList;
+    }
+}
+
 CreateTable CreateTable():
 {
     CreateTable createTable = new CreateTable();
@@ -3982,6 +4043,8 @@ List<String> CreateParameter():
             |
             tk=<K_PRIMARY> { param.add(tk.image); }
             |
+            tk=<K_DEFAULT> { param.add(tk.image); }
+            |
             tk=<K_FOREIGN> { param.add(tk.image); }
             |
             tk=<K_REFERENCES> { param.add(tk.image); }
@@ -4126,6 +4189,8 @@ Drop Drop():
         tk=<K_INDEX>
         |
         tk=<K_VIEW>
+        |
+        tk=<K_SCHEMA>
     )
     { drop.setType(tk.image); }
 

src/test/java/net/sf/jsqlparser/statement/create/schema/CreateSchemaTest.java

@@ -0,0 +1,25 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2020 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.create.schema;
+
+import net.sf.jsqlparser.JSQLParserException;
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
+import org.junit.Test;
+
+/**
+ *
+ * @author tw
+ */
+public class CreateSchemaTest {  
+    @Test
+    public void testSimpleCreateSchema() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE SCHEMA myschema");
+    }
+}

src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java

@@ -63,4 +63,9 @@ public void testDropViewIssue545() throws JSQLParserException {
     public void testDropViewIssue545_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP VIEW IF EXISTS myview");
     }
+    
+    @Test
+    public void testDropSchemaIssue855() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("DROP SCHEMA myschema");
+    }
 }