result = create().selectFrom(tableByName("t")).fetch();
+
+ assertEquals(1, result.size());
+ assertEquals(1, result.fields().length);
+ assertEquals("value", result.field(0).getName());
+ assertEquals("value", result.get(0).getValue(0));
+ }
+ finally {
+ ignoreThrows(() -> create().dropTable("t").execute());
}
}
}
diff --git a/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
index e2d6cf8761..802172dae2 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
@@ -1344,6 +1344,11 @@ public abstract class jOOQAbstractTest<
new DDLTests(this).testDropTable();
}
+ @Test
+ public void testCreateTableAsSelect() throws Exception {
+ new DDLTests(this).testCreateTableAsSelect();
+ }
+
@Test
public void testSelectInto() throws Exception {
new DDLTests(this).testSelectInto();
diff --git a/jOOQ/src/main/java/org/jooq/Clause.java b/jOOQ/src/main/java/org/jooq/Clause.java
index 41e0cd68cd..ef23fd69d3 100644
--- a/jOOQ/src/main/java/org/jooq/Clause.java
+++ b/jOOQ/src/main/java/org/jooq/Clause.java
@@ -787,6 +787,33 @@ public enum Clause {
// Clauses that are used in an ALTER statement
// -------------------------------------------------------------------------
+ /**
+ * A complete CREATE TABLE statement.
+ */
+ CREATE_TABLE,
+
+ /**
+ * A view name clause within a {@link #CREATE_TABLE} statement.
+ *
+ * This clause surrounds
+ *
+ * - The table name
+ * - The (optional) column names
+ *
+ */
+ CREATE_TABLE_NAME,
+
+ /**
+ * An AS clause within a {@link #CREATE_TABLE} statement.
+ *
+ * This clause surrounds
+ *
+ * - The
AS keyword
+ * - The select code
+ *
+ */
+ CREATE_TABLE_AS,
+
/**
* A complete CREATE VIEW statement.
*/
@@ -804,7 +831,7 @@ public enum Clause {
CREATE_VIEW_NAME,
/**
- * An as clause within a {@link #CREATE_VIEW} statement.
+ * An AS clause within a {@link #CREATE_VIEW} statement.
*
* This clause surrounds
*
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
new file mode 100644
index 0000000000..5fc4ece1cd
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2009-2014, Data Geekery GmbH (http://www.datageekery.com)
+ * All rights reserved.
+ *
+ * This work is dual-licensed
+ * - under the Apache Software License 2.0 (the "ASL")
+ * - under the jOOQ License and Maintenance Agreement (the "jOOQ License")
+ * =============================================================================
+ * You may choose which license applies to you:
+ *
+ * - If you're using this work with Open Source databases, you may choose
+ * either ASL or jOOQ License.
+ * - If you're using this work with at least one commercial database, you must
+ * choose jOOQ License
+ *
+ * For more information, please visit http://www.jooq.org/licenses
+ *
+ * Apache Software License 2.0:
+ * -----------------------------------------------------------------------------
+ * 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.
+ *
+ * jOOQ License and Maintenance Agreement:
+ * -----------------------------------------------------------------------------
+ * Data Geekery grants the Customer the non-exclusive, timely limited and
+ * non-transferable license to install and use the Software under the terms of
+ * the jOOQ License and Maintenance Agreement.
+ *
+ * This library is distributed with a LIMITED WARRANTY. See the jOOQ License
+ * and Maintenance Agreement for more details: http://www.jooq.org/licensing
+ */
+package org.jooq;
+
+// ...
+// ...
+import static org.jooq.SQLDialect.CUBRID;
+// ...
+import static org.jooq.SQLDialect.DERBY;
+import static org.jooq.SQLDialect.H2;
+import static org.jooq.SQLDialect.HSQLDB;
+// ...
+import static org.jooq.SQLDialect.MARIADB;
+import static org.jooq.SQLDialect.MYSQL;
+// ...
+import static org.jooq.SQLDialect.POSTGRES;
+import static org.jooq.SQLDialect.SQLITE;
+// ...
+// ...
+
+/**
+ * A {@link Query} that can create tables.
+ *
+ * @author Lukas Eder
+ */
+public interface CreateTableAsStep {
+
+ /**
+ * Add an AS clause to the CREATE TABLE statement.
+ */
+ @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+ CreateTableFinalStep as(Select extends R> select);
+}
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
new file mode 100644
index 0000000000..af2bb0872d
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2009-2014, Data Geekery GmbH (http://www.datageekery.com)
+ * All rights reserved.
+ *
+ * This work is dual-licensed
+ * - under the Apache Software License 2.0 (the "ASL")
+ * - under the jOOQ License and Maintenance Agreement (the "jOOQ License")
+ * =============================================================================
+ * You may choose which license applies to you:
+ *
+ * - If you're using this work with Open Source databases, you may choose
+ * either ASL or jOOQ License.
+ * - If you're using this work with at least one commercial database, you must
+ * choose jOOQ License
+ *
+ * For more information, please visit http://www.jooq.org/licenses
+ *
+ * Apache Software License 2.0:
+ * -----------------------------------------------------------------------------
+ * 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.
+ *
+ * jOOQ License and Maintenance Agreement:
+ * -----------------------------------------------------------------------------
+ * Data Geekery grants the Customer the non-exclusive, timely limited and
+ * non-transferable license to install and use the Software under the terms of
+ * the jOOQ License and Maintenance Agreement.
+ *
+ * This library is distributed with a LIMITED WARRANTY. See the jOOQ License
+ * and Maintenance Agreement for more details: http://www.jooq.org/licensing
+ */
+package org.jooq;
+
+/**
+ * A {@link Query} that can create tables.
+ *
+ * @author Lukas Eder
+ */
+public interface CreateTableFinalStep extends Query {
+
+}
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index e9b9792b30..e7843e3327 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -40,6 +40,7 @@
*/
package org.jooq;
+// ...
// ...
import static org.jooq.SQLDialect.CUBRID;
// ...
@@ -4788,6 +4789,22 @@ public interface DSLContext {
// XXX DDL Statements
// -------------------------------------------------------------------------
+ /**
+ * Create a new DSL CREATE TABLE statement.
+ *
+ * @see DSL#createTable(String)
+ */
+ @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+ CreateTableAsStep createTable(String tableName);
+
+ /**
+ * Create a new DSL CREATE TABLE statement.
+ *
+ * @see DSL#createTable(Table)
+ */
+ @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+ CreateTableAsStep createTable(Table> table);
+
/**
* Create a new DSL CREATE VIEW statement.
*
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
new file mode 100644
index 0000000000..4b72fee243
--- /dev/null
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2009-2014, Data Geekery GmbH (http://www.datageekery.com)
+ * All rights reserved.
+ *
+ * This work is dual-licensed
+ * - under the Apache Software License 2.0 (the "ASL")
+ * - under the jOOQ License and Maintenance Agreement (the "jOOQ License")
+ * =============================================================================
+ * You may choose which license applies to you:
+ *
+ * - If you're using this work with Open Source databases, you may choose
+ * either ASL or jOOQ License.
+ * - If you're using this work with at least one commercial database, you must
+ * choose jOOQ License
+ *
+ * For more information, please visit http://www.jooq.org/licenses
+ *
+ * Apache Software License 2.0:
+ * -----------------------------------------------------------------------------
+ * 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.
+ *
+ * jOOQ License and Maintenance Agreement:
+ * -----------------------------------------------------------------------------
+ * Data Geekery grants the Customer the non-exclusive, timely limited and
+ * non-transferable license to install and use the Software under the terms of
+ * the jOOQ License and Maintenance Agreement.
+ *
+ * This library is distributed with a LIMITED WARRANTY. See the jOOQ License
+ * and Maintenance Agreement for more details: http://www.jooq.org/licensing
+ */
+package org.jooq.impl;
+
+import static java.util.Arrays.asList;
+import static org.jooq.Clause.CREATE_TABLE;
+import static org.jooq.Clause.CREATE_TABLE_AS;
+import static org.jooq.Clause.CREATE_TABLE_NAME;
+// ...
+// ...
+// ...
+// ...
+import static org.jooq.impl.Utils.DATA_SELECT_INTO_TABLE;
+
+import org.jooq.Clause;
+import org.jooq.Configuration;
+import org.jooq.Context;
+import org.jooq.CreateTableAsStep;
+import org.jooq.CreateTableFinalStep;
+import org.jooq.Record;
+import org.jooq.Select;
+import org.jooq.Table;
+
+/**
+ * @author Lukas Eder
+ */
+class CreateTableImpl extends AbstractQuery implements
+
+ // Cascading interface implementations for CREATE TABLE behaviour
+ CreateTableAsStep,
+ CreateTableFinalStep {
+
+ /**
+ * Generated UID
+ */
+ private static final long serialVersionUID = 8904572826501186329L;
+
+ private final Table> table;
+ private Select> select;
+
+ CreateTableImpl(Configuration configuration, Table> table) {
+ super(configuration);
+
+ this.table = table;
+ }
+
+ // ------------------------------------------------------------------------
+ // XXX: DSL API
+ // ------------------------------------------------------------------------
+
+ @Override
+ public final CreateTableFinalStep as(Select extends R> s) {
+ this.select = s;
+ return this;
+ }
+
+ // ------------------------------------------------------------------------
+ // XXX: QueryPart API
+ // ------------------------------------------------------------------------
+
+ @Override
+ public final void accept(Context> ctx) {
+ /* [pro] xx
+ xx xxxxxxxxxxxxxxx xxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+ xxxxxxxxxxxxxxxxxxxxxx
+ x
+ xxxx
+ xx [/pro] */
+ {
+ acceptNative(ctx);
+ }
+ }
+
+ private final void acceptNative(Context> ctx) {
+ ctx.start(CREATE_TABLE)
+ .start(CREATE_TABLE_NAME)
+ .keyword("create table")
+ .sql(" ")
+ .visit(table)
+ .end(CREATE_TABLE_NAME)
+ .formatSeparator()
+ .keyword("as")
+ .formatSeparator()
+ .start(CREATE_TABLE_AS)
+ .visit(select)
+ .end(CREATE_TABLE_AS)
+ .end(CREATE_TABLE);
+ }
+
+ private final void acceptSelectInto(Context> ctx) {
+ ctx.data(DATA_SELECT_INTO_TABLE, table);
+ ctx.visit(select);
+ ctx.data().remove(DATA_SELECT_INTO_TABLE);
+ }
+
+ @Override
+ public final Clause[] clauses(Context> ctx) {
+ return null;
+ }
+}
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 37099b59f2..8491e6bf32 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -91,6 +91,7 @@ import org.jooq.Configuration;
import org.jooq.ConnectionProvider;
import org.jooq.CreateIndexStep;
import org.jooq.CreateSequenceFinalStep;
+import org.jooq.CreateTableAsStep;
import org.jooq.CreateViewAsStep;
import org.jooq.DSLContext;
import org.jooq.DataType;
@@ -4207,6 +4208,26 @@ public class DSL {
// XXX DDL Statements
// -------------------------------------------------------------------------
+ /**
+ * Create a new DSL CREATE TABLE statement.
+ *
+ * @see DSLContext#createTable(String)
+ */
+ @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+ public static CreateTableAsStep createTable(String tableName) {
+ return createTable(tableByName(tableName));
+ }
+
+ /**
+ * Create a new DSL CREATE TABLE statement.
+ *
+ * @see DSLContext#createTable(Table)
+ */
+ @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+ public static CreateTableAsStep createTable(Table> table) {
+ return using(new DefaultConfiguration()).createTable(table);
+ }
+
/**
* Create a new DSL CREATE VIEW statement.
*
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index e1f151ab04..c5088965f4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -84,6 +84,7 @@ import org.jooq.Configuration;
import org.jooq.ConnectionProvider;
import org.jooq.CreateIndexStep;
import org.jooq.CreateSequenceFinalStep;
+import org.jooq.CreateTableAsStep;
import org.jooq.CreateViewAsStep;
import org.jooq.Cursor;
import org.jooq.DSLContext;
@@ -1613,8 +1614,18 @@ public class DefaultDSLContext implements DSLContext, Serializable {
// -------------------------------------------------------------------------
@Override
- public CreateViewAsStep createView(String viewName, String... columnNames) {
- return new CreateViewImpl(configuration, viewName, columnNames);
+ public CreateViewAsStep createView(String viewName, String... fieldNames) {
+ return new CreateViewImpl(configuration, viewName, fieldNames);
+ }
+
+ @Override
+ public CreateTableAsStep createTable(String tableName) {
+ return createTable(tableByName(tableName));
+ }
+
+ @Override
+ public CreateTableAsStep createTable(Table> table) {
+ return new CreateTableImpl(configuration, table);
}
@Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index f867662440..7c989699e6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -81,8 +81,10 @@ import static org.jooq.impl.DSL.orderBy;
import static org.jooq.impl.DSL.row;
import static org.jooq.impl.Dual.DUAL_ACCESS;
import static org.jooq.impl.Utils.DATA_LOCALLY_SCOPED_DATA_MAP;
+import static org.jooq.impl.Utils.DATA_OMIT_INTO_CLAUSE;
import static org.jooq.impl.Utils.DATA_RENDERING_DB2_FINAL_TABLE_CLAUSE;
import static org.jooq.impl.Utils.DATA_ROW_VALUE_EXPRESSION_PREDICATE_SUBQUERY;
+import static org.jooq.impl.Utils.DATA_SELECT_INTO_TABLE;
import static org.jooq.impl.Utils.DATA_WINDOW_DEFINITIONS;
import static org.jooq.impl.Utils.DATA_WRAP_DERIVED_TABLES_IN_PARENTHESES;
@@ -200,15 +202,16 @@ class SelectQueryImpl extends AbstractSelect implements Sel
@Override
public final void accept(Context> context) {
+ if (into != null
+ && context.data(DATA_OMIT_INTO_CLAUSE) == null
+ && asList(CUBRID, DERBY, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE).contains(context.configuration().dialect().family())) {
- // [#3381] TODO: Delegate to a jOOQ CREATE TABLE AS statement
- if (into != null && asList(CUBRID, DERBY, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE).contains(context.configuration().dialect().family()))
- context.keyword("create table")
- .sql(" ")
- .visit(into)
- .formatSeparator()
- .keyword("as")
- .formatSeparator();
+ context.data(DATA_OMIT_INTO_CLAUSE, true);
+ context.visit(DSL.createTable(into).as(this));
+ context.data().remove(DATA_OMIT_INTO_CLAUSE);
+
+ return;
+ }
if (with != null)
context.visit(with).formatSeparator();
@@ -649,11 +652,18 @@ class SelectQueryImpl extends AbstractSelect implements Sel
// ------------
context.start(SELECT_INTO);
- if (into != null && asList(HSQLDB, POSTGRES).contains(dialect.family())) {
+ Table> actualInto = (Table>) context.data(DATA_SELECT_INTO_TABLE);
+ if (actualInto == null)
+ actualInto = into;
+
+ if (actualInto != null
+ && context.data(DATA_OMIT_INTO_CLAUSE) == null
+ && asList(HSQLDB, POSTGRES).contains(dialect.family())) {
+
context.formatSeparator()
.keyword("into")
.sql(" ")
- .visit(into);
+ .visit(actualInto);
}
context.end(SELECT_INTO);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java
index 78f18e61fa..c22d57d60c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Utils.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java
@@ -273,6 +273,16 @@ final class Utils {
*/
static final String DATA_DEFAULT_TRANSACTION_PROVIDER_CONNECTION = "org.jooq.configuration.default-transaction-provider-connection-provider";
+ /**
+ * [#3381] The table to be used for the {@link Clause#SELECT_INTO} clause.
+ */
+ static final String DATA_SELECT_INTO_TABLE = "org.jooq.configuration.select-into-table";
+
+ /**
+ * [#3381] Omit the {@link Clause#SELECT_INTO}, as it is being emulated.
+ */
+ static final String DATA_OMIT_INTO_CLAUSE = "org.jooq.configuration.omit-into-clause";
+
/**
* [#2965] These are {@link ConcurrentHashMap}s containing caches for
* reflection information.