From cb3003e9b686ab068b6c6643338b68926dbc98e0 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 22 Jul 2014 13:01:30 +0200 Subject: [PATCH] [#3435] Add support for SQL Server's SELECT .. INTO [new table] syntax --- .../org/jooq/test/all/testcases/DDLTests.java | 18 +++ .../java/org/jooq/test/jOOQAbstractTest.java | 5 + jOOQ/src/main/java/org/jooq/Clause.java | 15 +++ .../main/java/org/jooq/SelectIntoStep.java | 109 ++++++++++++++++++ jOOQ/src/main/java/org/jooq/SelectQuery.java | 7 ++ .../main/java/org/jooq/SelectSelectStep.java | 2 +- .../main/java/org/jooq/impl/SelectImpl.java | 7 ++ .../java/org/jooq/impl/SelectQueryImpl.java | 32 +++++ 8 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 jOOQ/src/main/java/org/jooq/SelectIntoStep.java diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/DDLTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/DDLTests.java index 95f7641492..50fc250f65 100644 --- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/DDLTests.java +++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/DDLTests.java @@ -50,6 +50,7 @@ import static org.jooq.impl.DSL.one; import static org.jooq.impl.DSL.select; import static org.jooq.impl.DSL.tableByName; import static org.jooq.impl.DSL.two; +import static org.jooq.impl.DSL.val; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.junit.Assume.assumeNotNull; @@ -57,10 +58,12 @@ import static org.junit.Assume.assumeNotNull; import java.math.BigInteger; import java.sql.Date; +import org.jooq.Record; import org.jooq.Record1; import org.jooq.Record2; import org.jooq.Record3; import org.jooq.Record6; +import org.jooq.Result; import org.jooq.Sequence; import org.jooq.TableRecord; import org.jooq.UpdatableRecord; @@ -311,4 +314,19 @@ extends BaseTest r2 = create().selectFrom(tableByName("value")).fetch(); + + assertEquals(1, r2.size()); + assertEquals(1, r2.fields().length); + assertEquals("value", r2.field(0).getName()); + assertEquals("value", r2.get(0).getValue(0)); + } + finally { + create().dropTable("value").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 ca9e02aeec..e2d6cf8761 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 testSelectInto() throws Exception { + new DDLTests(this).testSelectInto(); + } + @Test public void testTruncate() throws Exception { new TruncateTests(this).testTruncate(); diff --git a/jOOQ/src/main/java/org/jooq/Clause.java b/jOOQ/src/main/java/org/jooq/Clause.java index bd96ae61ac..41e0cd68cd 100644 --- a/jOOQ/src/main/java/org/jooq/Clause.java +++ b/jOOQ/src/main/java/org/jooq/Clause.java @@ -354,6 +354,21 @@ public enum Clause { */ SELECT_SELECT, + /** + * A INTO clause within a {@link #SELECT} statement. + *

+ * This clause surrounds + *

+ *

+ * See {@link #TABLE} and related clauses for possible table references. + * + * @see #TABLE + */ + SELECT_INTO, + /** * A FROM clause within a {@link #SELECT} statement or * subselect. diff --git a/jOOQ/src/main/java/org/jooq/SelectIntoStep.java b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java new file mode 100644 index 0000000000..4912fbba3f --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/SelectIntoStep.java @@ -0,0 +1,109 @@ +/** + * 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; +// ... +// ... + + +/** + * This type is used for the {@link Select}'s DSL API when selecting generic + * {@link Record} types. + *

+ * Example: 

+ * -- get all authors' first and last names, and the number
+ * -- of books they've written in German, if they have written
+ * -- more than five books in German in the last three years
+ * -- (from 2011), and sort those authors by last names
+ * -- limiting results to the second and third row
+ *
+ *   SELECT T_AUTHOR.FIRST_NAME, T_AUTHOR.LAST_NAME, COUNT(*)
+ *     FROM T_AUTHOR
+ *     JOIN T_BOOK ON T_AUTHOR.ID = T_BOOK.AUTHOR_ID
+ *    WHERE T_BOOK.LANGUAGE = 'DE'
+ *      AND T_BOOK.PUBLISHED > '2008-01-01'
+ * GROUP BY T_AUTHOR.FIRST_NAME, T_AUTHOR.LAST_NAME
+ *   HAVING COUNT(*) > 5
+ * ORDER BY T_AUTHOR.LAST_NAME ASC NULLS FIRST
+ *    LIMIT 2
+ *   OFFSET 1
+ *      FOR UPDATE
+ *       OF FIRST_NAME, LAST_NAME
+ *       NO WAIT
+ *
Its equivalent in jOOQ 
+ * create.select(TAuthor.FIRST_NAME, TAuthor.LAST_NAME, create.count())
+ *       .from(T_AUTHOR)
+ *       .join(T_BOOK).on(TBook.AUTHOR_ID.equal(TAuthor.ID))
+ *       .where(TBook.LANGUAGE.equal("DE"))
+ *       .and(TBook.PUBLISHED.greaterThan(parseDate('2008-01-01')))
+ *       .groupBy(TAuthor.FIRST_NAME, TAuthor.LAST_NAME)
+ *       .having(create.count().greaterThan(5))
+ *       .orderBy(TAuthor.LAST_NAME.asc().nullsFirst())
+ *       .limit(2)
+ *       .offset(1)
+ *       .forUpdate()
+ *       .of(TAuthor.FIRST_NAME, TAuthor.LAST_NAME)
+ *       .noWait();
+ *
Refer to the manual for more details + * + * @author Lukas Eder + */ +public interface SelectIntoStep extends SelectFromStep { + + /** + * Add additional fields to the SELECT clause of this query + */ + @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) + SelectIntoStep into(Table table); +} diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java index 5aabbe5bfc..ededebbd9c 100644 --- a/jOOQ/src/main/java/org/jooq/SelectQuery.java +++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java @@ -40,6 +40,7 @@ */ package org.jooq; +// ... // ... import static org.jooq.SQLDialect.CUBRID; // ... @@ -93,6 +94,12 @@ public interface SelectQuery extends Select, ConditionProvi @Support void setDistinct(boolean distinct); + /** + * Add INTO clause to the SELECT statement. + */ + @Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) + void setInto(Table table); + /** * Add tables to the table product. * diff --git a/jOOQ/src/main/java/org/jooq/SelectSelectStep.java b/jOOQ/src/main/java/org/jooq/SelectSelectStep.java index 894cb6b9fb..902776e0bf 100644 --- a/jOOQ/src/main/java/org/jooq/SelectSelectStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectSelectStep.java @@ -85,7 +85,7 @@ import java.util.Collection; * * @author Lukas Eder */ -public interface SelectSelectStep extends SelectFromStep { +public interface SelectSelectStep extends SelectIntoStep { /** * Add additional fields to the SELECT clause of this query diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index 0f50d04182..fa9e3a34db 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -214,6 +214,7 @@ class SelectImpl table) { + getQuery().setInto(table); + return this; + } + @Override public final SelectImpl hint(String hint) { getQuery().addHint(hint); diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 218c89c157..f867662440 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -47,6 +47,7 @@ import static org.jooq.Clause.SELECT_CONNECT_BY; import static org.jooq.Clause.SELECT_FROM; import static org.jooq.Clause.SELECT_GROUP_BY; import static org.jooq.Clause.SELECT_HAVING; +import static org.jooq.Clause.SELECT_INTO; import static org.jooq.Clause.SELECT_ORDER_BY; import static org.jooq.Clause.SELECT_SELECT; import static org.jooq.Clause.SELECT_START_WITH; @@ -57,6 +58,7 @@ import static org.jooq.Operator.OR; // ... // ... import static org.jooq.SQLDialect.CUBRID; +// ... import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; @@ -64,6 +66,7 @@ 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; // ... @@ -128,6 +131,7 @@ class SelectQueryImpl extends AbstractSelect implements Sel private final WithImpl with; private final SelectFieldList select; + private Table into; private String hint; private String option; private boolean distinct; @@ -196,6 +200,16 @@ class SelectQueryImpl extends AbstractSelect implements Sel @Override public final void accept(Context context) { + + // [#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(); + if (with != null) context.visit(with).formatSeparator(); @@ -631,6 +645,19 @@ class SelectQueryImpl extends AbstractSelect implements Sel context.declareFields(false) .end(SELECT_SELECT); + // INTO clauses + // ------------ + context.start(SELECT_INTO); + + if (into != null && asList(HSQLDB, POSTGRES).contains(dialect.family())) { + context.formatSeparator() + .keyword("into") + .sql(" ") + .visit(into); + } + + context.end(SELECT_INTO); + // FROM and JOIN clauses // --------------------- context.start(SELECT_FROM) @@ -821,6 +848,11 @@ class SelectQueryImpl extends AbstractSelect implements Sel this.distinct = distinct; } + @Override + public final void setInto(Table into) { + this.into = into; + } + @Override public final void addLimit(int numberOfRows) { addLimit(0, numberOfRows);