From 02bbd18c449080f78391d3f471b149bb0db1db0b Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 14 Sep 2021 14:43:41 +0200 Subject: [PATCH] [jOOQ/jOOQ#12425] Move IFNULL, NULLIF functions to API generator --- jOOQ/src/main/java/org/jooq/impl/DSL.java | 55 -------- jOOQ/src/main/java/org/jooq/impl/NullIf.java | 139 ------------------- 2 files changed, 194 deletions(-) delete mode 100644 jOOQ/src/main/java/org/jooq/impl/NullIf.java diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 095baaeb3a..73fe7a113f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -15639,61 +15639,6 @@ public class DSL { return new Nvl2<>(Tools.nullSafe(value), Tools.nullSafe(valueIfNotNull), Tools.nullSafe(valueIfNull)); } - /** - * Gets the Oracle-style NULLIF(value, other) function. - * - * @see #nullif(Field, Field) - */ - @NotNull - @Support - public static Field nullif(T value, T other) { - return nullif0(Tools.field(value), Tools.field(other)); - } - - /** - * Gets the Oracle-style NULLIF(value, other) function. - * - * @see #nullif(Field, Field) - */ - @NotNull - @Support - public static Field nullif(T value, Field other) { - return nullif0(Tools.field(value, other), Tools.nullSafe(other)); - } - - /** - * Gets the Oracle-style NULLIF(value, other) function. - * - * @see #nullif(Field, Field) - */ - @NotNull - @Support - public static Field nullif(Field value, T other) { - return nullif0(Tools.nullSafe(value), Tools.field(other, value)); - } - - /** - * Gets the Oracle-style NULLIF(value, other) function. - *

- * Returns the dialect's equivalent to NULLIF: - *

- *

- */ - @NotNull - @Support - public static Field nullif(Field value, Field other) { - return nullif0(value, other); - } - - // Java 8 is stricter than Java 7 with respect to generics and overload - // resolution (http://stackoverflow.com/q/5361513/521799) - static Field nullif0(Field value, Field other) { - return new NullIf<>(Tools.nullSafe(value), Tools.nullSafe(other)); - } - /** * Gets the SQL Server style IIF(condition, ifTrue, ifFalse) function. * diff --git a/jOOQ/src/main/java/org/jooq/impl/NullIf.java b/jOOQ/src/main/java/org/jooq/impl/NullIf.java deleted file mode 100644 index 65ab7869ce..0000000000 --- a/jOOQ/src/main/java/org/jooq/impl/NullIf.java +++ /dev/null @@ -1,139 +0,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. - * - * Other licenses: - * ----------------------------------------------------------------------------- - * Commercial licenses for this work are available. These replace the above - * ASL 2.0 and offer limited warranties, support, maintenance, and commercial - * database integrations. - * - * For more information, please visit: http://www.jooq.org/licenses - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - */ -package org.jooq.impl; - -import static org.jooq.impl.DSL.*; -import static org.jooq.impl.Internal.*; -import static org.jooq.impl.Keywords.*; -import static org.jooq.impl.Names.*; -import static org.jooq.impl.SQLDataType.*; -import static org.jooq.impl.Tools.*; -import static org.jooq.impl.Tools.BooleanDataKey.*; -import static org.jooq.impl.Tools.DataExtendedKey.*; -import static org.jooq.impl.Tools.DataKey.*; -import static org.jooq.SQLDialect.*; - -import org.jooq.*; -import org.jooq.Record; -import org.jooq.conf.*; -import org.jooq.impl.*; -import org.jooq.tools.*; - -import java.util.*; - - -/** - * The NULLIF statement. - */ -@SuppressWarnings({ "rawtypes", "unchecked", "unused" }) -final class Nullif -extends - AbstractField -{ - - private final Field value; - private final Field other; - - Nullif( - Field value, - Field other - ) { - super( - N_NULLIF, - nullable((DataType) dataType(value), value, other) - ); - - this.value = nullSafeNotNull(value, (DataType) OTHER); - this.other = nullSafeNotNull(other, (DataType) OTHER); - } - - // ------------------------------------------------------------------------- - // XXX: QueryPart API - // ------------------------------------------------------------------------- - - @Override - public final void accept(Context ctx) { - switch (ctx.family()) { - - - - - - - - - - - - - - default: - ctx.visit(function(N_NULLIF, getDataType(), value, other)); - break; - } - } - - - - - - - - - - - - - - - // ------------------------------------------------------------------------- - // The Object API - // ------------------------------------------------------------------------- - - @Override - public boolean equals(Object that) { - if (that instanceof Nullif) { - return - StringUtils.equals(value, ((Nullif) that).value) && - StringUtils.equals(other, ((Nullif) that).other) - ; - } - else - return super.equals(that); - } -}