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

[#4366] Add on(Boolean), where(Boolean), having(Boolean), etc

Browse Source
This commit is contained in:
lukaseder 2015-06-05 14:11:18 +02:00
parent dc4af15fa8
commit cba606a2c1
44 changed files with 728 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
jOOQ-release/build.xml
View File

@ -1,36 +1,36 @@
<?xml version="1.0"?>
<project name="jOOQ-release" basedir=".">
<property name="dir.workspace" value="${basedir}/.." />
<property name="dir.target" value="${basedir}/target" />
<property name="dir.release" value="${basedir}/release" />
<property name="version-prefix" value="3.7.0-SNAPSHOT"/>
<property name="dir.workspace" value="${basedir}/.." />
<property name="dir.target" value="${basedir}/target" />
<property name="dir.release" value="${basedir}/release" />
<property name="version-prefix" value="3.7.0-SNAPSHOT"/>
<!-- Run a full mvn clean package install deploy first before this -->
<target name="copy-lib-javadoc">
<!-- Run a full mvn clean package install deploy first before this -->
<target name="copy-lib-javadoc">
<mkdir dir="${dir.release}/versions" />
<mkdir dir="${dir.release}/${version}" />
<mkdir dir="${dir.release}/${version}/jOOQ-lib" />
<mkdir dir="${dir.release}/${version}/jOOQ-pom"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-meta"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-codegen"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-codegen-maven"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-scala"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-meta"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-codegen"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-codegen-maven"/>
<mkdir dir="${dir.release}/${version}/jOOQ-pom/jooq-scala"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ/target/jooq-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-lib" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version}.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ/target/jooq-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen/target/jooq-codegen-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-javadoc" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version-prefix}-javadoc.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-pom" file="${dir.workspace}/pom.xml"/>
<copy todir="${dir.release}/${version}/jOOQ-pom/jooq" file="${dir.workspace}/jOOQ/pom.xml"/>
<copy todir="${dir.release}/${version}/jOOQ-pom/jooq-meta" file="${dir.workspace}/jOOQ-meta/pom.xml"/>
@ -38,12 +38,12 @@
<copy todir="${dir.release}/${version}/jOOQ-pom/jooq-codegen" file="${dir.workspace}/jOOQ-codegen/pom.xml"/>
<copy todir="${dir.release}/${version}/jOOQ-pom/jooq-codegen-maven" file="${dir.workspace}/jOOQ-codegen-maven/pom.xml"/>
<copy todir="${dir.release}/${version}/jOOQ-pom/jooq-scala" file="${dir.workspace}/jOOQ-scala/pom.xml"/>
</target>
</target>
<target name="copy-src">
<mkdir dir="${dir.release}/versions" />
<mkdir dir="${dir.release}/${version}/jOOQ-src" />
<copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ/target/jooq-${version-prefix}-sources.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-meta/target/jooq-meta-${version-prefix}-sources.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-meta-extensions/target/jooq-meta-extensions-${version-prefix}-sources.jar"/>
@ -51,7 +51,7 @@
<copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-codegen-maven/target/jooq-codegen-maven-${version-prefix}-sources.jar"/>
<copy todir="${dir.release}/${version}/jOOQ-src" file="${dir.workspace}/jOOQ-scala/target/jooq-scala-${version-prefix}-sources.jar"/>
</target>
<target name="copy-trial">
<copy todir="${dir.release}/${version}">
<fileset dir="${dir.release}/template-trial">
@ -59,8 +59,8 @@
</fileset>
</copy>
</target>
<target name="rest">
<target name="rest">
<copy todir="${dir.release}/${version}">
<fileset dir="${dir.release}/template">
<include name="**/*"/>
@ -69,61 +69,61 @@
<mkdir dir="${dir.release}/${version}/third-party/lib" />
<mkdir dir="${dir.release}/${version}/third-party/src" />
<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\org\slf4j\slf4j-api\1.6.1\slf4j-api-1.6.1-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\log4j\log4j\1.2.16\log4j-1.2.16.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\log4j\log4j\1.2.16\log4j-1.2.16-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="${user.home}/.m2/repository/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="${user.home}/.m2/repository/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\javax\persistence\persistence-api\1.0\persistence-api-1.0.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\javax\persistence\persistence-api\1.0\persistence-api-1.0-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="${user.home}/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="${user.home}/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="C:\Users\lukas\.m2\repository\javax\validation\validation-api\1.1.0.Alpha1\validation-api-1.1.0.Alpha1.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="C:\Users\lukas\.m2\repository\javax\validation\validation-api\1.1.0.Alpha1\validation-api-1.1.0.Alpha1-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="${user.home}/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="${user.home}/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
<copy todir="${dir.release}/${version}/third-party/lib" file="${user.home}/.m2/repository/javax/validation/validation-api/1.1.0.Alpha1/validation-api-1.1.0.Alpha1.jar"/>
<copy todir="${dir.release}/${version}/third-party/src" file="${user.home}/.m2/repository/javax/validation/validation-api/1.1.0.Alpha1/validation-api-1.1.0.Alpha1-sources.jar"/>
<zip destfile="${dir.release}/versions/jOOQ-${version}.zip">
<fileset dir="${dir.release}/${version}"/>
</zip>
<delete dir="${dir.release}/${version}"/>
</target>
</target>
<!-- [java-8] -->
<!-- [trial] -->
<target name="release-oss" description="Release a new version">
<property name="version" value="${version-prefix}"/>
<antcall target="copy-lib-javadoc"/>
<!-- [trial] -->
<target name="release-oss" description="Release a new version">
<property name="version" value="${version-prefix}"/>
<antcall target="copy-lib-javadoc"/>
<antcall target="copy-src"/>
<antcall target="rest"/>
</target>
<!-- [pro] xxx
<antcall target="rest"/>
</target>
<!-- [pro] xxx
xxxxxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx x xxx xxxxxxxxx
xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxx
xxxxxxxxx
xxxx xxxxxxxx xxx
xxxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx x xxx xxxxxxxxx
xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxx
xxxxxxxxx
xxxx xxxxxxxxx xxx
xxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx x xxx xxxxxxxxx
xxxxxxxxx xxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxxxxxx
xxxxxxxx xxxxxxxxxxxxxxx
xxxxxxxxx
xxxx [/pro] -->
xxxx [/pro] -->
</project>

18
jOOQ/src/main/java/org/jooq/AggregateFilterStep.java
View File

@ -67,15 +67,19 @@ public interface AggregateFilterStep<T> extends WindowBeforeOverStep<T> {
WindowBeforeOverStep<T> filterWhere(Collection<? extends Condition> conditions);
/**
* Add a <code>FILTER clause</code> to the aggregate function, connecting
* conditions with each other with {@link Operator#AND}.
* Add a <code>FILTER clause</code> to the aggregate function.
*/
@Support
WindowBeforeOverStep<T> filterWhere(Field<Boolean> field);
/**
* Add a <code>FILTER clause</code> to the aggregate function, connecting
* conditions with each other with {@link Operator#AND}.
* Add a <code>FILTER clause</code> to the aggregate function.
*/
@Support
WindowBeforeOverStep<T> filterWhere(Boolean field);
/**
* Add a <code>FILTER clause</code> to the aggregate function.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
@ -89,8 +93,7 @@ public interface AggregateFilterStep<T> extends WindowBeforeOverStep<T> {
WindowBeforeOverStep<T> filterWhere(String sql);
/**
* Add a <code>FILTER clause</code> to the aggregate function, connecting
* conditions with each other with {@link Operator#AND}.
* Add a <code>FILTER clause</code> to the aggregate function.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
@ -104,8 +107,7 @@ public interface AggregateFilterStep<T> extends WindowBeforeOverStep<T> {
WindowBeforeOverStep<T> filterWhere(String sql, Object... bindings);
/**
* Add a <code>FILTER clause</code> to the aggregate function, connecting
* conditions with each other with {@link Operator#AND}.
* Add a <code>FILTER clause</code> to the aggregate function.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of

40
jOOQ/src/main/java/org/jooq/Condition.java
View File

@ -71,6 +71,16 @@ public interface Condition extends QueryPart {
@Support
Condition and(Field<Boolean> other);
/**
* Combine this condition with another one using the {@link Operator#AND}
* operator.
*
* @param other The other condition
* @return The combined condition
*/
@Support
Condition and(Boolean other);
/**
* Combine this condition with another one using the {@link Operator#AND}
* operator.
@ -146,6 +156,16 @@ public interface Condition extends QueryPart {
@Support
Condition andNot(Field<Boolean> other);
/**
* Combine this condition with a negated other one using the
* {@link Operator#AND} operator.
*
* @param other The other condition
* @return The combined condition
*/
@Support
Condition andNot(Boolean other);
/**
* Combine this condition with an EXISTS clause using the
* {@link Operator#AND} operator.
@ -186,6 +206,16 @@ public interface Condition extends QueryPart {
@Support
Condition or(Field<Boolean> other);
/**
* Combine this condition with another one using the {@link Operator#OR}
* operator.
*
* @param other The other condition
* @return The combined condition
*/
@Support
Condition or(Boolean other);
/**
* Combine this condition with another one using the {@link Operator#OR}
* operator.
@ -261,6 +291,16 @@ public interface Condition extends QueryPart {
@Support
Condition orNot(Field<Boolean> other);
/**
* Combine this condition with a negated other one using the
* {@link Operator#OR} operator.
*
* @param other The other condition
* @return The combined condition
*/
@Support
Condition orNot(Boolean other);
/**
* Combine this condition with an EXISTS clause using the
* {@link Operator#OR} operator.

1
jOOQ/src/main/java/org/jooq/CreateTableAsStep.java
View File

@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
import static org.jooq.SQLDialect.SQLITE;
// ...

1
jOOQ/src/main/java/org/jooq/DSLContext.java
View File

@ -55,6 +55,7 @@ import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
import static org.jooq.SQLDialect.SQLITE;
// ...
// ...

28
jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
View File

@ -72,6 +72,13 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
@Support
DeleteConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator
*/
@Support
DeleteConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator
@ -131,6 +138,13 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
@Support
DeleteConditionStep<R> andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator
*/
@Support
DeleteConditionStep<R> andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#AND} operator
@ -158,6 +172,13 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
@Support
DeleteConditionStep<R> or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator
*/
@Support
DeleteConditionStep<R> or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator
@ -217,6 +238,13 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
@Support
DeleteConditionStep<R> orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator
*/
@Support
DeleteConditionStep<R> orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#OR} operator

6
jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
View File

@ -79,6 +79,12 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
@Support
DeleteConditionStep<R> where(Field<Boolean> condition);
/**
* Add conditions to the query.
*/
@Support
DeleteConditionStep<R> where(Boolean condition);
/**
* Add conditions to the query.
* <p>

28
jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
View File

@ -64,6 +64,13 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
@Support
DivideByOnConditionStep and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator.
*/
@Support
DivideByOnConditionStep and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator.
@ -123,6 +130,13 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
@Support
DivideByOnConditionStep andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator.
*/
@Support
DivideByOnConditionStep andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an <code>EXISTS</code>
* clause using the {@link Operator#AND} operator.
@ -151,6 +165,13 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
@Support
DivideByOnConditionStep or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator.
*/
@Support
DivideByOnConditionStep or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator.
@ -210,6 +231,13 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
@Support
DivideByOnConditionStep orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator.
*/
@Support
DivideByOnConditionStep orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an <code>EXISTS</code>
* clause using the {@link Operator#OR} operator.

6
jOOQ/src/main/java/org/jooq/DivideByOnStep.java
View File

@ -63,6 +63,12 @@ public interface DivideByOnStep {
@Support
DivideByOnConditionStep on(Field<Boolean> condition);
/**
* Add a division condition to the <code>DIVIDE BY</code> clause
*/
@Support
DivideByOnConditionStep on(Boolean condition);
/**
* Add a division condition to the <code>DIVIDE BY</code> clause
* <p>

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

@ -93,4 +93,19 @@ public interface MergeMatchedDeleteStep<R extends Record> extends MergeNotMatche
*/
@Support({ CUBRID })
MergeNotMatchedStep<R> deleteWhere(Field<Boolean> condition);
/**
* Add an additional <code>DELETE WHERE</code> clause to the preceding
* <code>WHEN MATCHED THEN UPDATE</code> clause.
* <p>
* <b>Note:</b> This syntax is only available for the
* {@link SQLDialect#CUBRID} and {@link SQLDialect#ORACLE} databases!
* <p>
* See <a href=
* "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
* >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
* htm</a> for a full definition of the Oracle <code>MERGE</code> statement
*/
@Support({ CUBRID })
MergeNotMatchedStep<R> deleteWhere(Boolean condition);
}

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

@ -93,4 +93,19 @@ public interface MergeMatchedWhereStep<R extends Record> extends MergeNotMatched
*/
@Support({ CUBRID })
MergeMatchedDeleteStep<R> where(Field<Boolean> condition);
/**
* Add an additional <code>WHERE</code> clause to the preceding
* <code>WHEN MATCHED THEN UPDATE</code> clause.
* <p>
* <b>Note:</b> This syntax is only available for the
* {@link SQLDialect#CUBRID} and {@link SQLDialect#ORACLE} databases!
* <p>
* See <a href=
* "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
* >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
* htm</a> for a full definition of the Oracle <code>MERGE</code> statement
*/
@Support({ CUBRID })
MergeMatchedDeleteStep<R> where(Boolean condition);
}

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

@ -93,4 +93,19 @@ public interface MergeNotMatchedWhereStep<R extends Record> extends MergeFinalSt
*/
@Support({ CUBRID })
MergeFinalStep<R> where(Field<Boolean> condition);
/**
* Add an additional <code>WHERE</code> clause to the preceding
* <code>WHEN NOT MATCHED THEN INSERT</code> clause.
* <p>
* <b>Note:</b> This syntax is only available for the
* {@link SQLDialect#CUBRID} and {@link SQLDialect#ORACLE} databases!
* <p>
* See <a href=
* "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
* >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
* htm</a> for a full definition of the Oracle <code>MERGE</code> statement
*/
@Support({ CUBRID })
MergeFinalStep<R> where(Boolean condition);
}

28
jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
View File

@ -84,6 +84,13 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
*/
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
@ -143,6 +150,13 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator and proceed to the next step.
*/
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#AND} operator and proceed to the next step.
@ -171,6 +185,13 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
*/
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
@ -230,6 +251,13 @@ public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator and proceed to the next step.
*/
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#OR} operator and proceed to the next step.

6
jOOQ/src/main/java/org/jooq/MergeOnStep.java
View File

@ -83,6 +83,12 @@ public interface MergeOnStep<R extends Record> {
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> on(Field<Boolean> condition);
/**
* Provide join conditions and proceed to the next step
*/
@Support({ CUBRID, HSQLDB })
MergeOnConditionStep<R> on(Boolean condition);
/**
* Provide join conditions and proceed to the next step
* <p>

1
jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java
View File

@ -50,6 +50,7 @@ import static org.jooq.SQLDialect.MYSQL;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
// ...
import java.util.Collection;

28
jOOQ/src/main/java/org/jooq/SelectConditionStep.java
View File

@ -101,6 +101,13 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
@Support
SelectConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
*/
@Support
SelectConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
@ -160,6 +167,13 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
@Support
SelectConditionStep<R> andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator and proceed to the next step.
*/
@Support
SelectConditionStep<R> andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#AND} operator and proceed to the next step.
@ -188,6 +202,13 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
@Support
SelectConditionStep<R> or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
*/
@Support
SelectConditionStep<R> or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
@ -247,6 +268,13 @@ public interface SelectConditionStep<R extends Record> extends SelectConnectBySt
@Support
SelectConditionStep<R> orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator and proceed to the next step.
*/
@Support
SelectConditionStep<R> orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#OR} operator and proceed to the next step.

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

@ -103,6 +103,13 @@ public interface SelectConnectByConditionStep<R extends Record> extends SelectSt
@Support({ CUBRID })
SelectConnectByConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
*/
@Support({ CUBRID })
SelectConnectByConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.

13
jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
View File

@ -102,6 +102,12 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
@Support({ CUBRID })
SelectConnectByConditionStep<R> connectBy(Field<Boolean> condition);
/**
* Add an Oracle-specific <code>CONNECT BY</code> clause to the query
*/
@Support({ CUBRID })
SelectConnectByConditionStep<R> connectBy(Boolean condition);
/**
* Add an Oracle-specific <code>CONNECT BY</code> clause to the query
* <p>
@ -158,6 +164,13 @@ public interface SelectConnectByStep<R extends Record> extends SelectGroupByStep
@Support({ CUBRID })
SelectConnectByConditionStep<R> connectByNoCycle(Field<Boolean> condition);
/**
* Add an Oracle-specific <code>CONNECT BY NOCYCLE</code> clause to the
* query
*/
@Support({ CUBRID })
SelectConnectByConditionStep<R> connectByNoCycle(Boolean condition);
/**
* Add an Oracle-specific <code>CONNECT BY NOCYCLE</code> clause to the
* query

28
jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
View File

@ -101,6 +101,13 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
@Support
SelectHavingConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
*/
@Support
SelectHavingConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
@ -160,6 +167,13 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
@Support
SelectHavingConditionStep<R> andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator and proceed to the next step.
*/
@Support
SelectHavingConditionStep<R> andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#AND} operator and proceed to the next step.
@ -188,6 +202,13 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
@Support
SelectHavingConditionStep<R> or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
*/
@Support
SelectHavingConditionStep<R> or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
@ -247,6 +268,13 @@ public interface SelectHavingConditionStep<R extends Record> extends SelectWindo
@Support
SelectHavingConditionStep<R> orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator and proceed to the next step.
*/
@Support
SelectHavingConditionStep<R> orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#OR} operator and proceed to the next step.

6
jOOQ/src/main/java/org/jooq/SelectHavingStep.java
View File

@ -108,6 +108,12 @@ public interface SelectHavingStep<R extends Record> extends SelectWindowStep<R>
@Support
SelectHavingConditionStep<R> having(Field<Boolean> condition);
/**
* Add a <code>HAVING</code> clause to the query.
*/
@Support
SelectHavingConditionStep<R> having(Boolean condition);
/**
* Add a <code>HAVING</code> clause to the query.
* <p>

28
jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
View File

@ -101,6 +101,13 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
@Support
SelectOnConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
*/
@Support
SelectOnConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator and proceed to the next step.
@ -160,6 +167,13 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
@Support
SelectOnConditionStep<R> andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator and proceed to the next step.
*/
@Support
SelectOnConditionStep<R> andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#AND} operator and proceed to the next step.
@ -188,6 +202,13 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
@Support
SelectOnConditionStep<R> or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
*/
@Support
SelectOnConditionStep<R> or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator and proceed to the next step.
@ -247,6 +268,13 @@ public interface SelectOnConditionStep<R extends Record> extends SelectJoinStep<
@Support
SelectOnConditionStep<R> orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator and proceed to the next step.
*/
@Support
SelectOnConditionStep<R> orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#OR} operator and proceed to the next step.

6
jOOQ/src/main/java/org/jooq/SelectOnStep.java
View File

@ -102,6 +102,12 @@ public interface SelectOnStep<R extends Record> {
@Support
SelectOnConditionStep<R> on(Field<Boolean> condition);
/**
* Add an <code>ON</code> clause to the previous <code>JOIN</code>.
*/
@Support
SelectOnConditionStep<R> on(Boolean condition);
/**
* Add an <code>ON</code> clause to the previous <code>JOIN</code>.
* <p>

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

@ -104,6 +104,13 @@ public interface SelectStartWithStep<R extends Record> extends SelectGroupByStep
@Support({ CUBRID })
SelectGroupByStep<R> startWith(Field<Boolean> condition);
/**
* Add an Oracle-specific <code>START WITH</code> clause to the query's
* <code>CONNECT BY</code> clause.
*/
@Support({ CUBRID })
SelectGroupByStep<R> startWith(Boolean condition);
/**
* Add an Oracle-specific <code>START WITH</code> clause to the query's
* <code>CONNECT BY</code> clause.

6
jOOQ/src/main/java/org/jooq/SelectWhereStep.java
View File

@ -108,6 +108,12 @@ public interface SelectWhereStep<R extends Record> extends SelectConnectByStep<R
@Support
SelectConditionStep<R> where(Field<Boolean> field);
/**
* Add a <code>WHERE</code> clause to the query.
*/
@Support
SelectConditionStep<R> where(Boolean field);
/**
* Add a <code>WHERE</code> clause to the query.
* <p>

28
jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
View File

@ -67,6 +67,13 @@ public interface TableOnConditionStep extends Table<Record> {
@Support
TableOnConditionStep and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator.
*/
@Support
TableOnConditionStep and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator.
@ -126,6 +133,13 @@ public interface TableOnConditionStep extends Table<Record> {
@Support
TableOnConditionStep andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator.
*/
@Support
TableOnConditionStep andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an <code>EXISTS</code>
* clause using the {@link Operator#AND} operator.
@ -154,6 +168,13 @@ public interface TableOnConditionStep extends Table<Record> {
@Support
TableOnConditionStep or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator.
*/
@Support
TableOnConditionStep or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator.
@ -213,6 +234,13 @@ public interface TableOnConditionStep extends Table<Record> {
@Support
TableOnConditionStep orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator.
*/
@Support
TableOnConditionStep orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an <code>EXISTS</code>
* clause using the {@link Operator#OR} operator.

6
jOOQ/src/main/java/org/jooq/TableOnStep.java
View File

@ -68,6 +68,12 @@ public interface TableOnStep {
@Support
TableOnConditionStep on(Field<Boolean> condition);
/**
* Add an <code>ON</code> clause to the <code>JOIN</code>.
*/
@Support
TableOnConditionStep on(Boolean condition);
/**
* Add an <code>ON</code> clause to the <code>JOIN</code>.
* <p>

28
jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
View File

@ -74,6 +74,13 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
@Support
UpdateConditionStep<R> and(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator
*/
@Support
UpdateConditionStep<R> and(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#AND} operator
@ -133,6 +140,13 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
@Support
UpdateConditionStep<R> andNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#AND} operator
*/
@Support
UpdateConditionStep<R> andNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#AND} operator
@ -161,6 +175,13 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
@Support
UpdateConditionStep<R> or(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator
*/
@Support
UpdateConditionStep<R> or(Boolean condition);
/**
* Combine the currently assembled conditions with another one using the
* {@link Operator#OR} operator
@ -220,6 +241,13 @@ public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R
@Support
UpdateConditionStep<R> orNot(Field<Boolean> condition);
/**
* Combine the currently assembled conditions with a negated other one using
* the {@link Operator#OR} operator
*/
@Support
UpdateConditionStep<R> orNot(Boolean condition);
/**
* Combine the currently assembled conditions with an EXISTS clause using
* the {@link Operator#OR} operator

6
jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
View File

@ -81,6 +81,12 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, U
@Support
UpdateConditionStep<R> where(Field<Boolean> condition);
/**
* Add conditions to the query
*/
@Support
UpdateConditionStep<R> where(Boolean condition);
/**
* Add conditions to the query
* <p>

20
jOOQ/src/main/java/org/jooq/impl/AbstractCondition.java
View File

@ -84,6 +84,11 @@ abstract class AbstractCondition extends AbstractQueryPart implements Condition
return and(condition(other));
}
@Override
public Condition and(Boolean other) {
return and(condition(other));
}
@Override
public final Condition or(Condition other) {
return DSL.or(this, other);
@ -94,6 +99,11 @@ abstract class AbstractCondition extends AbstractQueryPart implements Condition
return or(condition(other));
}
@Override
public final Condition or(Boolean other) {
return or(condition(other));
}
@Override
public final Condition and(String sql) {
return and(condition(sql));
@ -134,6 +144,11 @@ abstract class AbstractCondition extends AbstractQueryPart implements Condition
return andNot(condition(other));
}
@Override
public final Condition andNot(Boolean other) {
return andNot(condition(other));
}
@Override
public final Condition orNot(Condition other) {
return or(other.not());
@ -144,6 +159,11 @@ abstract class AbstractCondition extends AbstractQueryPart implements Condition
return orNot(condition(other));
}
@Override
public final Condition orNot(Boolean other) {
return orNot(condition(other));
}
@Override
public final Condition andExists(Select<?> select) {
return and(exists(select));

20
jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
View File

@ -140,6 +140,11 @@ class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvid
return getWhere().and(other);
}
@Override
public final Condition and(Boolean other) {
return getWhere().and(other);
}
@Override
public final Condition and(String sql) {
return getWhere().and(sql);
@ -165,6 +170,11 @@ class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvid
return getWhere().andNot(other);
}
@Override
public final Condition andNot(Boolean other) {
return getWhere().andNot(other);
}
@Override
public final Condition andExists(Select<?> select) {
return getWhere().andExists(select);
@ -185,6 +195,11 @@ class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvid
return getWhere().or(other);
}
@Override
public final Condition or(Boolean other) {
return getWhere().or(other);
}
@Override
public final Condition or(String sql) {
return getWhere().or(sql);
@ -210,6 +225,11 @@ class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvid
return getWhere().orNot(other);
}
@Override
public final Condition orNot(Boolean other) {
return getWhere().orNot(other);
}
@Override
public final Condition orExists(Select<?> select) {
return getWhere().orExists(select);

3
jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
View File

@ -52,6 +52,7 @@ import static org.jooq.SQLDialect.FIREBIRD;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
// ...
import static org.jooq.impl.DSL.field;
import static org.jooq.impl.DSL.name;
import static org.jooq.impl.Utils.DATA_SELECT_INTO_TABLE;
@ -245,7 +246,7 @@ class CreateTableImpl<R extends Record> extends AbstractQuery implements
.sql(' ');
if (temporary)
if (ctx.family() == POSTGRES)
if (asList(POSTGRES).contains(ctx.family()))
ctx.keyword("temporary").sql(' ');
else
ctx.keyword("global temporary").sql(' ');

1
jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
View File

@ -75,6 +75,7 @@ class CurrentUser extends AbstractFunction<String> {
xxxx xxxx
xxxx xxxxx
xxxx xxxxxxx
xxxx xxxxxxxxx
xxxx xxxxxxxxxx
xxxx xxxxxxx
xx [/pro] */

60
jOOQ/src/main/java/org/jooq/impl/DSL.java
View File

@ -3476,7 +3476,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1> MergeKeyStep1<R, T1> mergeInto(Table<R> table, Field<T1> field1) {
return using(new DefaultConfiguration()).mergeInto(table, field1);
return using(new DefaultConfiguration()).mergeInto(table, field1);
}
/**
@ -3508,7 +3508,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2> MergeKeyStep2<R, T1, T2> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2);
}
/**
@ -3540,7 +3540,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3> MergeKeyStep3<R, T1, T2, T3> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3);
}
/**
@ -3572,7 +3572,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4> MergeKeyStep4<R, T1, T2, T3, T4> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4);
}
/**
@ -3604,7 +3604,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5> MergeKeyStep5<R, T1, T2, T3, T4, T5> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5);
}
/**
@ -3636,7 +3636,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6> MergeKeyStep6<R, T1, T2, T3, T4, T5, T6> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6);
}
/**
@ -3668,7 +3668,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7> MergeKeyStep7<R, T1, T2, T3, T4, T5, T6, T7> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7);
}
/**
@ -3700,7 +3700,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8> MergeKeyStep8<R, T1, T2, T3, T4, T5, T6, T7, T8> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8);
}
/**
@ -3732,7 +3732,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9> MergeKeyStep9<R, T1, T2, T3, T4, T5, T6, T7, T8, T9> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9);
}
/**
@ -3764,7 +3764,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> MergeKeyStep10<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10);
}
/**
@ -3796,7 +3796,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> MergeKeyStep11<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11);
}
/**
@ -3828,7 +3828,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> MergeKeyStep12<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12);
}
/**
@ -3860,7 +3860,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> MergeKeyStep13<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13);
}
/**
@ -3892,7 +3892,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> MergeKeyStep14<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14);
}
/**
@ -3924,7 +3924,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> MergeKeyStep15<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15);
}
/**
@ -3956,7 +3956,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> MergeKeyStep16<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16);
}
/**
@ -3988,7 +3988,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> MergeKeyStep17<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17);
}
/**
@ -4020,7 +4020,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> MergeKeyStep18<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18);
}
/**
@ -4052,7 +4052,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> MergeKeyStep19<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19);
}
/**
@ -4084,7 +4084,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> MergeKeyStep20<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20);
}
/**
@ -4116,7 +4116,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> MergeKeyStep21<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21);
}
/**
@ -4148,7 +4148,7 @@ public class DSL {
@Generated("This method was generated using jOOQ-tools")
@Support({ CUBRID, H2, HSQLDB })
public static <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MergeKeyStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22) {
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22);
return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22);
}
// [jooq-tools] END [merge]
@ -11506,6 +11506,10 @@ public class DSL {
* The
* <code>percentile_cont([number]) within group (order by [column])</code>
* function.
* <p>
* While {@link SQLDialect#ORACLE} and {@link SQLDialect#POSTGRES} support
* this as an aggregate function, {@link SQLDialect#SQLSERVER} and
* {@link SQLDialect#REDSHIFT} support only its window function variant.
*/
@Support({ POSTGRES_9_4 })
public static OrderedAggregateFunction<BigDecimal> percentileCont(Number number) {
@ -11516,6 +11520,10 @@ public class DSL {
* The
* <code>percentile_cont([number]) within group (order by [column])</code>
* function.
* <p>
* While {@link SQLDialect#ORACLE} and {@link SQLDialect#POSTGRES} support
* this as an aggregate function, {@link SQLDialect#SQLSERVER} and
* {@link SQLDialect#REDSHIFT} support only its window function variant.
*/
@Support({ POSTGRES_9_4 })
public static OrderedAggregateFunction<BigDecimal> percentileCont(Field<? extends Number> field) {
@ -11526,6 +11534,10 @@ public class DSL {
* The
* <code>percentile_disc([number]) within group (order by [column])</code>
* function.
* <p>
* While {@link SQLDialect#ORACLE} and {@link SQLDialect#POSTGRES} support
* this as an aggregate function, {@link SQLDialect#SQLSERVER} and
* {@link SQLDialect#REDSHIFT} support only its window function variant.
*/
@Support({ POSTGRES_9_4 })
public static OrderedAggregateFunction<BigDecimal> percentileDisc(Number number) {
@ -11536,6 +11548,10 @@ public class DSL {
* The
* <code>percentile_disc([number]) within group (order by [column])</code>
* function.
* <p>
* While {@link SQLDialect#ORACLE} and {@link SQLDialect#POSTGRES} support
* this as an aggregate function, {@link SQLDialect#SQLSERVER} and
* {@link SQLDialect#REDSHIFT} support only its window function variant.
*/
@Support({ POSTGRES_9_4 })
public static OrderedAggregateFunction<BigDecimal> percentileDisc(Field<? extends Number> field) {

3
jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
View File

@ -57,6 +57,7 @@ import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
// ...
import static org.jooq.SQLDialect.POSTGRES;
// ...
import static org.jooq.SQLDialect.SQLITE;
// ...
// ...
@ -367,7 +368,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
// above case where the type is OTHER
// [#1125] Also with temporal data types, casting is needed some times
// [#1130] TODO type can be null for ARRAY types, etc.
else if (family == POSTGRES && (sqlDataType == null || !sqlDataType.isTemporal())) {
else if (asList(POSTGRES).contains(family) && (sqlDataType == null || !sqlDataType.isTemporal())) {
toSQL(ctx, converted);
}

25
jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
View File

@ -98,6 +98,11 @@ class DeleteImpl<R extends Record>
return where(condition(condition));
}
@Override
public final DeleteImpl<R> where(Boolean condition) {
return where(condition(condition));
}
@Override
public final DeleteImpl<R> where(String sql) {
return where(condition(sql));
@ -134,6 +139,11 @@ class DeleteImpl<R extends Record>
return and(condition(condition));
}
@Override
public final DeleteImpl<R> and(Boolean condition) {
return and(condition(condition));
}
@Override
public final DeleteImpl<R> and(String sql) {
return and(condition(sql));
@ -159,6 +169,11 @@ class DeleteImpl<R extends Record>
return andNot(condition(condition));
}
@Override
public final DeleteImpl<R> andNot(Boolean condition) {
return andNot(condition(condition));
}
@Override
public final DeleteImpl<R> andExists(Select<?> select) {
return and(exists(select));
@ -180,6 +195,11 @@ class DeleteImpl<R extends Record>
return or(condition(condition));
}
@Override
public final DeleteImpl<R> or(Boolean condition) {
return or(condition(condition));
}
@Override
public final DeleteImpl<R> or(String sql) {
return or(condition(sql));
@ -205,6 +225,11 @@ class DeleteImpl<R extends Record>
return orNot(condition(condition));
}
@Override
public final DeleteImpl<R> orNot(Boolean condition) {
return orNot(condition(condition));
}
@Override
public final DeleteImpl<R> orExists(Select<?> select) {
return or(exists(select));

25
jOOQ/src/main/java/org/jooq/impl/DivideBy.java
View File

@ -164,6 +164,11 @@ implements
return on(condition(c));
}
@Override
public final DivideByOnConditionStep on(Boolean c) {
return on(condition(c));
}
@Override
public final DivideByOnConditionStep on(String sql) {
and(sql);
@ -204,6 +209,11 @@ implements
return and(condition(c));
}
@Override
public final DivideByOnConditionStep and(Boolean c) {
return and(condition(c));
}
@Override
public final DivideByOnConditionStep and(String sql) {
return and(condition(sql));
@ -229,6 +239,11 @@ implements
return andNot(condition(c));
}
@Override
public final DivideByOnConditionStep andNot(Boolean c) {
return andNot(condition(c));
}
@Override
public final DivideByOnConditionStep andExists(Select<?> select) {
return and(exists(select));
@ -250,6 +265,11 @@ implements
return or(condition(c));
}
@Override
public final DivideByOnConditionStep or(Boolean c) {
return or(condition(c));
}
@Override
public final DivideByOnConditionStep or(String sql) {
return or(condition(sql));
@ -275,6 +295,11 @@ implements
return orNot(condition(c));
}
@Override
public final DivideByOnConditionStep orNot(Boolean c) {
return orNot(condition(c));
}
@Override
public final DivideByOnConditionStep orExists(Select<?> select) {
return or(exists(select));

5
jOOQ/src/main/java/org/jooq/impl/Function.java
View File

@ -602,6 +602,11 @@ class Function<T> extends AbstractField<T> implements
return filterWhere(condition(field));
}
@Override
public final WindowBeforeOverStep<T> filterWhere(Boolean field) {
return filterWhere(condition(field));
}
@Override
public final WindowBeforeOverStep<T> filterWhere(String sql) {
return filterWhere(condition(sql));

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

@ -146,7 +146,12 @@ class GroupConcat extends AbstractFunction<String> implements GroupConcatOrderBy
}
@Override
public final AggregateFilterStep<String> filterWhere(Field<Boolean> field) {
public final AggregateFilterStep<String> filterWhere(Field<Boolean> c) {
throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function");
}
@Override
public final AggregateFilterStep<String> filterWhere(Boolean c) {
throw new UnsupportedOperationException("FILTER() not supported on GROUP_CONCAT aggregate function");
}

1
jOOQ/src/main/java/org/jooq/impl/Identifiers.java
View File

@ -104,6 +104,7 @@ class Identifiers {
xxxx xxxxxxxxx
xxxx xxxxxxx
xxxx xxxxxxx
xxxx xxxxxxxxx
xx [/pro] */
case CUBRID:
case DERBY:

25
jOOQ/src/main/java/org/jooq/impl/JoinTable.java
View File

@ -428,6 +428,11 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
return on(condition(c));
}
@Override
public final JoinTable on(Boolean c) {
return on(condition(c));
}
@Override
public final JoinTable on(String sql) {
and(sql);
@ -528,6 +533,11 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
return and(condition(c));
}
@Override
public final JoinTable and(Boolean c) {
return and(condition(c));
}
@Override
public final JoinTable and(String sql) {
return and(condition(sql));
@ -553,6 +563,11 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
return andNot(condition(c));
}
@Override
public final JoinTable andNot(Boolean c) {
return andNot(condition(c));
}
@Override
public final JoinTable andExists(Select<?> select) {
return and(exists(select));
@ -574,6 +589,11 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
return or(condition(c));
}
@Override
public final JoinTable or(Boolean c) {
return or(condition(c));
}
@Override
public final JoinTable or(String sql) {
return or(condition(sql));
@ -599,6 +619,11 @@ class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep, Ta
return orNot(condition(c));
}
@Override
public final JoinTable orNot(Boolean c) {
return orNot(condition(c));
}
@Override
public final JoinTable orExists(Select<?> select) {
return or(exists(select));

35
jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
View File

@ -585,6 +585,11 @@ implements
return on(condition(condition));
}
@Override
public final MergeOnConditionStep<R> on(Boolean condition) {
return on(condition(condition));
}
@Override
public final MergeImpl on(String sql) {
return on(condition(sql));
@ -611,6 +616,11 @@ implements
return and(condition(condition));
}
@Override
public final MergeImpl and(Boolean condition) {
return and(condition(condition));
}
@Override
public final MergeImpl and(String sql) {
return and(condition(sql));
@ -636,6 +646,11 @@ implements
return and(condition(condition));
}
@Override
public final MergeImpl andNot(Boolean condition) {
return andNot(condition(condition));
}
@Override
public final MergeImpl andExists(Select<?> select) {
return and(exists(select));
@ -657,6 +672,11 @@ implements
return and(condition(condition));
}
@Override
public final MergeImpl or(Boolean condition) {
return and(condition(condition));
}
@Override
public final MergeImpl or(String sql) {
return or(condition(sql));
@ -682,6 +702,11 @@ implements
return and(condition(condition));
}
@Override
public final MergeImpl orNot(Boolean condition) {
return orNot(condition(condition));
}
@Override
public final MergeImpl orExists(Select<?> select) {
return or(exists(select));
@ -923,6 +948,11 @@ implements
return where(condition(condition));
}
@Override
public final MergeMatchedDeleteStep<R> where(Boolean condition) {
return where(condition(condition));
}
@Override
public final MergeImpl deleteWhere(Condition condition) {
matchedDeleteWhere = condition;
@ -934,6 +964,11 @@ implements
return deleteWhere(condition(condition));
}
@Override
public final MergeImpl deleteWhere(Boolean condition) {
return deleteWhere(condition(condition));
}
// -------------------------------------------------------------------------
// QueryPart API
// -------------------------------------------------------------------------

1
jOOQ/src/main/java/org/jooq/impl/Replace.java
View File

@ -81,6 +81,7 @@ class Replace extends AbstractFunction<String> {
xxxx xxxx
xxxx xxxxx
xxxx xxxxxxx
xxxx xxxxxxxxx
xxxx xxxxxxxxxx
xxxx xxxxxxx
xxxx xxxxxxxx

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

@ -338,6 +338,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return where(condition(condition));
}
@Override
public final SelectImpl where(Boolean condition) {
return where(condition(condition));
}
@Override
public final SelectImpl where(String sql) {
return where(condition(sql));
@ -390,6 +395,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return and(condition(condition));
}
@Override
public final SelectImpl and(Boolean condition) {
return and(condition(condition));
}
@Override
public final SelectImpl and(String sql) {
return and(condition(sql));
@ -415,6 +425,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return andNot(condition(condition));
}
@Override
public final SelectImpl andNot(Boolean condition) {
return andNot(condition(condition));
}
@Override
public final SelectImpl andExists(Select<?> select) {
return and(exists(select));
@ -449,6 +464,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return or(condition(condition));
}
@Override
public final SelectImpl or(Boolean condition) {
return or(condition(condition));
}
@Override
public final SelectImpl or(String sql) {
return or(condition(sql));
@ -474,6 +494,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return orNot(condition(condition));
}
@Override
public final SelectImpl orNot(Boolean condition) {
return orNot(condition(condition));
}
@Override
public final SelectImpl orExists(Select<?> select) {
return or(exists(select));
@ -496,6 +521,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return connectBy(condition(condition));
}
@Override
public final SelectImpl connectBy(Boolean condition) {
return connectBy(condition(condition));
}
@Override
public final SelectImpl connectBy(String sql) {
return connectBy(condition(sql));
@ -523,6 +553,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return connectByNoCycle(condition(condition));
}
@Override
public final SelectImpl connectByNoCycle(Boolean condition) {
return connectByNoCycle(condition(condition));
}
@Override
public final SelectImpl connectByNoCycle(String sql) {
return connectByNoCycle(condition(sql));
@ -549,6 +584,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return startWith(condition(condition));
}
@Override
public final SelectImpl startWith(Boolean condition) {
return startWith(condition(condition));
}
@Override
public final SelectImpl startWith(String sql) {
return startWith(condition(sql));
@ -1911,6 +1951,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return having(condition(condition));
}
@Override
public final SelectImpl having(Boolean condition) {
return having(condition(condition));
}
@Override
public final SelectImpl having(String sql) {
return having(condition(sql));
@ -1962,6 +2007,11 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return on(condition(condition));
}
@Override
public final SelectImpl on(Boolean condition) {
return on(condition(condition));
}
@Override
public final SelectImpl on(String sql) {
return on(condition(sql));
@ -2366,7 +2416,7 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
return getDelegate().stream();
}
/* [/java-8] */
@Override
public final Cursor<R> fetchLazy() {
return getDelegate().fetchLazy();

25
jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
View File

@ -527,6 +527,11 @@ final class UpdateImpl<R extends Record>
return where(condition(condition));
}
@Override
public final UpdateImpl<R> where(Boolean condition) {
return where(condition(condition));
}
@Override
public final UpdateImpl<R> where(String sql) {
return where(condition(sql));
@ -563,6 +568,11 @@ final class UpdateImpl<R extends Record>
return and(condition(condition));
}
@Override
public final UpdateImpl<R> and(Boolean condition) {
return and(condition(condition));
}
@Override
public final UpdateImpl<R> and(String sql) {
return and(condition(sql));
@ -588,6 +598,11 @@ final class UpdateImpl<R extends Record>
return andNot(condition(condition));
}
@Override
public final UpdateImpl<R> andNot(Boolean condition) {
return andNot(condition(condition));
}
@Override
public final UpdateImpl<R> andExists(Select<?> select) {
return and(exists(select));
@ -609,6 +624,11 @@ final class UpdateImpl<R extends Record>
return or(condition(condition));
}
@Override
public final UpdateImpl<R> or(Boolean condition) {
return or(condition(condition));
}
@Override
public final UpdateImpl<R> or(String sql) {
return or(condition(sql));
@ -634,6 +654,11 @@ final class UpdateImpl<R extends Record>
return orNot(condition(condition));
}
@Override
public final UpdateImpl<R> orNot(Boolean condition) {
return orNot(condition(condition));
}
@Override
public final UpdateImpl<R> orExists(Select<?> select) {
return or(exists(select));