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

Java 6 fixes

Browse Source
This commit is contained in:
lukaseder 2018-06-01 10:37:39 +02:00
parent 643b6a5f07
commit 261d176293
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,6 +278,8 @@ public interface ResultQuery<R extends Record> extends Query, Iterable<R> {
*/
<X, A> X collect(Collector<? super R, A, X> collector) throws DataAccessException;
/**
* Execute the query and "lazily" return the generated result.
* <p>

6
jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
View File

@ -644,16 +644,16 @@ final class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
// [#7365] PostgreSQL ON CONFLICT (conflict columns) clause
if (onConflict != null && onConflict.size() > 0)
return Collections.singletonList(onConflict);
return Collections.<List<? extends Field<?>>>singletonList(onConflict);
// [#7409] PostgreSQL ON CONFLICT ON CONSTRAINT clause
else if (onConstraintUniqueKey != null)
return Collections.singletonList(onConstraintUniqueKey.getFields());
return Collections.<List<? extends Field<?>>>singletonList(onConstraintUniqueKey.getFields());
// [#6462] MySQL ON DUPLICATE KEY UPDATE clause
// Flag for backwards compatibility considers only PRIMARY KEY
else if (TRUE.equals(Tools.settings(configuration).isEmulateOnDuplicateKeyUpdateOnPrimaryKeyOnly()))
return Collections.singletonList(table.getPrimaryKey().getFields());
return Collections.<List<? extends Field<?>>>singletonList(table.getPrimaryKey().getFields());
// [#6462] MySQL ON DUPLICATE KEY UPDATE clause
// All conflicting keys are considered