diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 960feeb443..e6d1f8a263 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -602,6 +602,26 @@ public interface DSLContext extends Scope , AutoCloseable { @Support LoaderOptionsStep loadInto(Table table); + // ------------------------------------------------------------------------- + // XXX: Queries + // ------------------------------------------------------------------------- + + /** + * Wrap a collection of queries. + * + * @see DSL#queries(Query...) + */ + @Support + Queries queries(Query... queries); + + /** + * Wrap a collection of queries. + * + * @see DSL#queries(Collection) + */ + @Support + Queries queries(Collection queries); + // ------------------------------------------------------------------------- // XXX Plain SQL API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 4c742f061a..1037a1f316 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -7997,6 +7997,8 @@ public class DSL { /** * Wrap a collection of queries. + * + * @see DSLContext#queries(Query...) */ @Support public static Queries queries(Query... queries) { @@ -8005,10 +8007,12 @@ public class DSL { /** * Wrap a collection of queries. + * + * @see DSLContext#queries(Collection) */ @Support public static Queries queries(Collection queries) { - return new QueriesImpl(new DefaultConfiguration(), queries); + return DSL.using(new DefaultConfiguration()).queries(queries); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 8d7fb76d9e..eafa9cca3a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -706,6 +706,20 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new LoaderImpl(configuration(), table); } + // ------------------------------------------------------------------------- + // XXX: Queries + // ------------------------------------------------------------------------- + + @Override + public Queries queries(Query... queries) { + return queries(Arrays.asList(queries)); + } + + @Override + public Queries queries(Collection queries) { + return new QueriesImpl(configuration(), queries); + } + // ------------------------------------------------------------------------- // XXX Plain SQL API // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 13ae1ef08a..c2ef4502aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -343,7 +343,7 @@ class ParserImpl implements Parser { if (!ctx.done()) throw ctx.exception("Unexpected content after end of queries input"); - return new QueriesImpl(dsl.configuration(), result); + return dsl.queries(result); } @Override