github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#3435] Add support for SQL Server's SELECT .. INTO [new table] syntax

Browse Source
This commit is contained in:
Lukas Eder 2014-07-22 13:01:30 +02:00
parent 9371101efe
commit cb3003e9b6
8 changed files with 194 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jOOQ-test/src/test/java/org/jooq/test/all/testcases/DDLTests.java
View File

@ -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<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
private String varchar() {
return SQLDataType.VARCHAR.length(10).getCastTypeName(create().configuration());
}
public void testSelectInto() throws Exception {
try {
create().select(val("value").as("value")).into(tableByName("value")).execute();
Result<Record> 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();
}
}
}

5
jOOQ-test/src/test/java/org/jooq/test/jOOQAbstractTest.java
View File

@ -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();

15
jOOQ/src/main/java/org/jooq/Clause.java
View File

@ -354,6 +354,21 @@ public enum Clause {
*/
SELECT_SELECT,
/**
* A <code>INTO</code> clause within a {@link #SELECT} statement.
* <p>
* This clause surrounds
* <ul>
* <li>the <code>INTO</code> keyword</li>
* <li>the table reference</li>
* </ul>
* <p>
* See {@link #TABLE} and related clauses for possible table references.
*
* @see #TABLE
*/
SELECT_INTO,
/**
* A <code>FROM</code> clause within a {@link #SELECT} statement or
* subselect.

109
jOOQ/src/main/java/org/jooq/SelectIntoStep.java Normal file
View File

@ -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.
* <p>
* Example: <code><pre>
* -- 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
* </pre></code> Its equivalent in jOOQ <code><pre>
* 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();
* </pre></code> Refer to the manual for more details
*
* @author Lukas Eder
*/
public interface SelectIntoStep<R extends Record> extends SelectFromStep<R> {
/**
* Add additional fields to the <code>SELECT</code> clause of this query
*/
@Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
SelectIntoStep<Record> into(Table<?> table);
}

7
jOOQ/src/main/java/org/jooq/SelectQuery.java
View File

@ -40,6 +40,7 @@
*/
package org.jooq;
// ...
// ...
import static org.jooq.SQLDialect.CUBRID;
// ...
@ -93,6 +94,12 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
@Support
void setDistinct(boolean distinct);
/**
* Add <code>INTO</code> clause to the <code>SELECT</code> statement.
*/
@Support({ CUBRID, DERBY, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
void setInto(Table<?> table);
/**
* Add tables to the table product.
*

2
jOOQ/src/main/java/org/jooq/SelectSelectStep.java
View File

@ -85,7 +85,7 @@ import java.util.Collection;
*
* @author Lukas Eder
*/
public interface SelectSelectStep<R extends Record> extends SelectFromStep<R> {
public interface SelectSelectStep<R extends Record> extends SelectIntoStep<R> {
/**
* Add additional fields to the <code>SELECT</code> clause of this query

7
jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
View File

@ -214,6 +214,7 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
}
@Override
@Deprecated
public final int fetchCount() {
return getDelegate().fetchCount();
}
@ -238,6 +239,12 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return this;
}
@Override
public final SelectImpl into(Table<?> table) {
getQuery().setInto(table);
return this;
}
@Override
public final SelectImpl hint(String hint) {
getQuery().addHint(hint);

32
jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
View File

@ -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<R extends Record> extends AbstractSelect<R> 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<R extends Record> extends AbstractSelect<R> 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<R extends Record> extends AbstractSelect<R> 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<R extends Record> extends AbstractSelect<R> 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);