Skip to content

Commit

Permalink
[jOOQ#5244] Add support for CREATE SCHEMA
Browse files Browse the repository at this point in the history
  • Loading branch information
lukaseder committed May 17, 2016
1 parent 40e8e24 commit 0d7d85a
Show file tree
Hide file tree
Showing 6 changed files with 234 additions and 0 deletions.
15 changes: 15 additions & 0 deletions jOOQ/src/main/java/org/jooq/Clause.java
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,21 @@ public enum Clause {
*/
CREATE_TABLE_CONSTRAINTS,

/**
* A complete <code>CREATE SCHEMA</code> statement.
*/
CREATE_SCHEMA,

/**
* A view name clause within a {@link #CREATE_SCHEMA} statement.
* <p>
* This clause surrounds
* <ul>
* <li>The schema name</li>
* </ul>
*/
CREATE_SCHEMA_NAME,

/**
* A complete <code>CREATE VIEW</code> statement.
*/
Expand Down
50 changes: 50 additions & 0 deletions jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/**
* Copyright (c) 2009-2016, Data Geekery GmbH (http://www.datageekery.com)
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: http://www.jooq.org/licenses
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq;

/**
* A {@link Query} that can create schemas.
*
* @author Lukas Eder
*/
public interface CreateSchemaFinalStep extends DDLQuery {

}
24 changes: 24 additions & 0 deletions jOOQ/src/main/java/org/jooq/DSLContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -6929,6 +6929,30 @@ public interface DSLContext extends Scope , AutoCloseable {
// XXX DDL Statements
// -------------------------------------------------------------------------

/**
* Create a new DSL <code>CREATE SCHEMA</code> statement.
*
* @see DSL#createSchema(String)
*/
@Support({ POSTGRES })
CreateSchemaFinalStep createSchema(String schema);

/**
* Create a new DSL <code>CREATE SCHEMA</code> statement.
*
* @see DSL#createSchema(Name)
*/
@Support({ POSTGRES })
CreateSchemaFinalStep createSchema(Name schema);

/**
* Create a new DSL <code>CREATE SCHEMA</code> statement.
*
* @see DSL#createSchema(Schema)
*/
@Support({ POSTGRES })
CreateSchemaFinalStep createSchema(Schema schema);

/**
* Create a new DSL <code>CREATE TABLE</code> statement.
*
Expand Down
96 changes: 96 additions & 0 deletions jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/**
* Copyright (c) 2009-2016, Data Geekery GmbH (http://www.datageekery.com)
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: http://www.jooq.org/licenses
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq.impl;

import static org.jooq.Clause.CREATE_SCHEMA;
import static org.jooq.Clause.CREATE_SCHEMA_NAME;

import org.jooq.Clause;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.CreateSchemaFinalStep;
import org.jooq.Record;
import org.jooq.Schema;

/**
* @author Lukas Eder
*/
final class CreateSchemaImpl<R extends Record> extends AbstractQuery implements

// Cascading interface implementations for CREATE SCHEMA behaviour
CreateSchemaFinalStep {


/**
* Generated UID
*/
private static final long serialVersionUID = 8904572826501186329L;
private static final Clause[] CLAUSES = { CREATE_SCHEMA };

private final Schema schema;

CreateSchemaImpl(Configuration configuration, Schema schema) {
super(configuration);

this.schema = schema;
}

// ------------------------------------------------------------------------
// XXX: DSL API
// ------------------------------------------------------------------------

// ------------------------------------------------------------------------
// XXX: QueryPart API
// ------------------------------------------------------------------------

@Override
public final void accept(Context<?> ctx) {
ctx.start(CREATE_SCHEMA_NAME)
.keyword("create schema")
.sql(' ').visit(schema)
.end(CREATE_SCHEMA_NAME);
}

@Override
public final Clause[] clauses(Context<?> ctx) {
return CLAUSES;
}
}
32 changes: 32 additions & 0 deletions jOOQ/src/main/java/org/jooq/impl/DSL.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
import org.jooq.ConnectionProvider;
import org.jooq.ConstraintTypeStep;
import org.jooq.CreateIndexStep;
import org.jooq.CreateSchemaFinalStep;
import org.jooq.CreateSequenceFinalStep;
import org.jooq.CreateTableAsStep;
import org.jooq.CreateViewAsStep;
Expand Down Expand Up @@ -4797,6 +4798,37 @@ public static ConstraintTypeStep constraint(String name) {
// XXX DDL Statements
// -------------------------------------------------------------------------

/**
* Create a new DSL <code>CREATE SCHEMA</code> statement.
*
* @see DSLContext#createSchema(String)
*/
@Support({ POSTGRES })
public static CreateSchemaFinalStep createSchema(String schema) {
return using(new DefaultConfiguration()).createSchema(schema);
}

/**
* Create a new DSL <code>CREATE SCHEMA</code> statement.
*
* @see DSLContext#createSchema(Name)
*/
@Support({ POSTGRES })
public static CreateSchemaFinalStep createSchema(Name table) {
return using(new DefaultConfiguration()).createSchema(table);
}

/**
* Create a new DSL <code>CREATE SCHEMA</code> statement.
*
* @see DSLContext#createSchema(Schema)
*/
@Support({ POSTGRES })
public static CreateSchemaFinalStep createSchema(Schema schema) {
return using(new DefaultConfiguration()).createSchema(schema);
}


/**
* Create a new DSL <code>CREATE TABLE</code> statement.
*
Expand Down
17 changes: 17 additions & 0 deletions jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import static org.jooq.conf.ParamType.NAMED_OR_INLINED;
import static org.jooq.impl.DSL.field;
import static org.jooq.impl.DSL.name;
import static org.jooq.impl.DSL.schema;
import static org.jooq.impl.DSL.sequence;
import static org.jooq.impl.DSL.sql;
import static org.jooq.impl.DSL.table;
Expand Down Expand Up @@ -94,6 +95,7 @@
import org.jooq.ConnectionProvider;
import org.jooq.ConnectionRunnable;
import org.jooq.CreateIndexStep;
import org.jooq.CreateSchemaFinalStep;
import org.jooq.CreateSequenceFinalStep;
import org.jooq.CreateTableAsStep;
import org.jooq.CreateViewAsStep;
Expand Down Expand Up @@ -2381,6 +2383,21 @@ public CreateViewAsStep<Record> createViewIfNotExists(Table<?> view, Field<?>...
return new CreateViewImpl<Record>(configuration(), view, fields, true);
}

@Override
public CreateSchemaFinalStep createSchema(String schema) {
return createSchema(name(schema));
}

@Override
public CreateSchemaFinalStep createSchema(Name schema) {
return createSchema(schema(schema));
}

@Override
public CreateSchemaFinalStep createSchema(Schema schema) {
return new CreateSchemaImpl(configuration(), schema);
}

@Override
public CreateTableAsStep<Record> createTable(String table) {
return createTable(name(table));
Expand Down

0 comments on commit 0d7d85a

Please sign in to comment.