feat: CREATE SCHEMA with catalog

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

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

@@ -21,6 +21,7 @@
 public class CreateSchema implements Statement {
 
     private String authorization;
+    private String catalogName = null;
     private String schemaName;
     private List<String> schemaPath;
     private List<Statement> statements = new ArrayList<>();
@@ -59,6 +60,15 @@ public void setAuthorization(String authorization) {
         this.authorization = authorization;
     }
 
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    public CreateSchema setCatalogName(String catalogName) {
+        this.catalogName = catalogName;
+        return this;
+    }
+
     /**
      * The name of the schema
      *
@@ -119,7 +129,12 @@ public String toString() {
             sql += " IF NOT EXISTS";
         }
         if (schemaName != null) {
-            sql += " " + schemaName;
+            sql += " ";
+
+            if (catalogName!=null) {
+                sql += catalogName + ".";
+            }
+            sql += schemaName;
         }
         if (authorization != null) {
             sql += " AUTHORIZATION " + authorization;

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

@@ -7866,15 +7866,21 @@ CreateSchema CreateSchema():
     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_SCHEMA>
     [ LOOKAHEAD(2) <K_IF> <K_NOT> <K_EXISTS> { schema.setIfNotExists(true); } ]
-    [ ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { schema.setSchemaName(tk.image); } ]
+    [
+        ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { schema.setSchemaName(tk.image); }
+
+        (
+            "." { schema.setCatalogName(tk.image); }
+            ( tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { schema.setSchemaName(tk.image); }
+        )?
+    ]
+
     [ <K_AUTHORIZATION>
         (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { schema.setAuthorization(tk.image); }
     ]

src/test/java/net/sf/jsqlparser/statement/SessionStatementTest.java

@@ -21,7 +21,7 @@ class SessionStatementTest {
     @ValueSource(strings = {
             "SESSION START 1234", "SESSION START", "SESSION APPLY 'test'", "SESSION APPLY",
             "SESSION DROP \"test\"", "SESSION DROP", "SESSION SHOW test", "SESSION SHOW",
-            "SESSION DESCRIBE 1234", "SESSION DESCRIBE", "SESSION APPLY unnamed.session1"
+            "SESSION DESCRIBE 1234", "SESSION DESCRIBE", "SESSION START unnamed.session1"
     })
     void testStartSession(String sqlStr) throws JSQLParserException {
         SessionStatement sessionStatement =

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

@@ -27,6 +27,12 @@ public void testSimpleCreateSchema() throws JSQLParserException {
         assertDeparse(new CreateSchema().withSchemaName("myschema"), statement);
     }
 
+    @Test
+    public void testCreateSchemaWithcatalog() throws JSQLParserException {
+        String statement = "CREATE SCHEMA unnamed.myschema";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
+
     @Test
     public void testSimpleCreateWithAuth() throws JSQLParserException {
         String statement = "CREATE SCHEMA myschema AUTHORIZATION myauth";

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

@@ -98,6 +98,7 @@ public void testDropMaterializedView() throws JSQLParserException {
     @Test
     public void testDropSchemaIssue855() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("DROP SCHEMA myschema");
+        assertSqlCanBeParsedAndDeparsed("DROP SCHEMA unnamed.myschema");
     }
 
     @Test

src/test/java/net/sf/jsqlparser/statement/select/OrderByCollateTest.java

@@ -1,3 +1,12 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2025 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
 package net.sf.jsqlparser.statement.select;
 
 import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
@@ -30,4 +39,4 @@ public void testOrderByWithCollateAndNulls() throws JSQLParserException {
         String sql = "SELECT * FROM a ORDER BY col COLLATE \"C\" DESC NULLS LAST";
         assertSqlCanBeParsedAndDeparsed(sql);
     }
-}
+}