From 9caa7041c2010d5b1916ca8280041fdb088032c8 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 27 Oct 2012 22:33:51 +0200 Subject: [PATCH] [#1887] Remove all deprecated code --- jOOQ/src/main/java/org/jooq/Field.java | 436 ------------------ .../java/org/jooq/impl/AbstractField.java | 182 -------- 2 files changed, 618 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index 830a1530f9..0c2788052d 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -1742,442 +1742,6 @@ public interface Field extends QueryPart { @Support Condition notEqualIgnoreCase(Field value); - // ------------------------------------------------------------------------ - // Quantified comparison predicates - // ------------------------------------------------------------------------ - - /** - * this = any (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition equalAny(Select query); - - /** - * this = any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition equalAny(T... array); - - /** - * this = any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, CUBRID, HSQLDB, POSTGRES }) - Condition equalAny(Field array); - - /** - * this = all (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition equalAll(Select query); - - /** - * this = all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition equalAll(T... array); - - /** - * this = all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition equalAll(Field array); - - /** - * this != any (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition notEqualAny(Select query); - - /** - * this != any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition notEqualAny(T... array); - - /** - * this != any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition notEqualAny(Field array); - - /** - * this != all (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition notEqualAll(Select query); - - /** - * this != all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition notEqualAll(T... array); - - /** - * this != all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition notEqualAll(Field array); - - /** - * this < any (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessThanAny(Select query); - - /** - * this < any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessThanAny(T... array); - - /** - * this < any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition lessThanAny(Field array); - - /** - * this < all (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessThanAll(Select query); - - /** - * this < all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessThanAll(T... array); - - /** - * this < all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition lessThanAll(Field array); - - /** - * this <= any (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessOrEqualAny(Select query); - - /** - * this <= any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessOrEqualAny(T... array); - - /** - * this <= any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition lessOrEqualAny(Field array); - - /** - * this <= all (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessOrEqualAll(Select query); - - /** - * this <= all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition lessOrEqualAll(T... array); - - /** - * this <= all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition lessOrEqualAll(Field array); - - /** - * this > any (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterThanAny(Select query); - - /** - * this > any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterThanAny(T... array); - - /** - * this > any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition greaterThanAny(Field array); - - /** - * this > all (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterThanAll(Select query); - - /** - * this > all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterThanAll(T... array); - - /** - * this > all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition greaterThanAll(Field array); - - /** - * this >= any (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterOrEqualAny(Select query); - - /** - * this >= any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterOrEqualAny(T... array); - - /** - * this >= any (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#any(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition greaterOrEqualAny(Field array); - - /** - * this >= all (Select ...) - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Select)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterOrEqualAll(Select query); - - /** - * this >= all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Object...)} instead - * for quantified comparison predicates - */ - @Deprecated - @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE }) - Condition greaterOrEqualAll(T... array); - - /** - * this >= all (array) - *

- * This is natively supported by {@link SQLDialect#POSTGRES}. Other dialects - * will render a subselect unnesting the array. - * - * @deprecated - 2.7.0 [#1697] - Use {@link Factory#all(Field)} instead for - * quantified comparison predicates - */ - @Deprecated - @Support({ H2, HSQLDB, POSTGRES }) - Condition greaterOrEqualAll(Field array); - // ------------------------------------------------------------------------ // Pre-2.0 API. This API is maintained for backwards-compatibility. It will // be removed in the future. Consider using equivalent methods from diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java index 221f7a7160..f6df3026fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java @@ -39,8 +39,6 @@ import static org.jooq.impl.ExpressionOperator.ADD; import static org.jooq.impl.ExpressionOperator.DIVIDE; import static org.jooq.impl.ExpressionOperator.MULTIPLY; import static org.jooq.impl.ExpressionOperator.SUBTRACT; -import static org.jooq.impl.Factory.all; -import static org.jooq.impl.Factory.any; import static org.jooq.impl.Factory.falseCondition; import static org.jooq.impl.Factory.inline; import static org.jooq.impl.Factory.nullSafe; @@ -807,36 +805,6 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return new QuantifiedComparisonCondition(query, this, Comparator.EQUALS); } - @Override - public final Condition equalAny(Select query) { - return equal(any(query)); - } - - @Override - public final Condition equalAny(T... array) { - return equal(any(array)); - } - - @Override - public final Condition equalAny(Field array) { - return equal(any(array)); - } - - @Override - public final Condition equalAll(Select query) { - return equal(all(query)); - } - - @Override - public final Condition equalAll(T... array) { - return equal(all(array)); - } - - @Override - public final Condition equalAll(Field array) { - return equal(all(array)); - } - @Override public final Condition notEqual(T value) { return notEqual(val(value, this)); @@ -867,36 +835,6 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return new QuantifiedComparisonCondition(query, this, Comparator.NOT_EQUALS); } - @Override - public final Condition notEqualAny(Select query) { - return notEqual(any(query)); - } - - @Override - public final Condition notEqualAny(T... array) { - return notEqual(any(array)); - } - - @Override - public final Condition notEqualAny(Field array) { - return notEqual(any(array)); - } - - @Override - public final Condition notEqualAll(Select query) { - return notEqual(all(query)); - } - - @Override - public final Condition notEqualAll(T... array) { - return notEqual(all(array)); - } - - @Override - public final Condition notEqualAll(Field array) { - return notEqual(all(array)); - } - @Override public final Condition lessThan(T value) { return lessThan(val(value, this)); @@ -917,36 +855,6 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return new QuantifiedComparisonCondition(query, this, Comparator.LESS); } - @Override - public final Condition lessThanAny(Select query) { - return lessThan(any(query)); - } - - @Override - public final Condition lessThanAny(T... array) { - return lessThan(any(array)); - } - - @Override - public final Condition lessThanAny(Field array) { - return lessThan(any(array)); - } - - @Override - public final Condition lessThanAll(Select query) { - return lessThan(all(query)); - } - - @Override - public final Condition lessThanAll(T... array) { - return lessThan(all(array)); - } - - @Override - public final Condition lessThanAll(Field array) { - return lessThan(all(array)); - } - @Override public final Condition lessOrEqual(T value) { return lessOrEqual(val(value, this)); @@ -967,36 +875,6 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return new QuantifiedComparisonCondition(query, this, Comparator.LESS_OR_EQUAL); } - @Override - public final Condition lessOrEqualAny(Select query) { - return lessOrEqual(any(query)); - } - - @Override - public final Condition lessOrEqualAny(T... array) { - return lessOrEqual(any(array)); - } - - @Override - public final Condition lessOrEqualAny(Field array) { - return lessOrEqual(any(array)); - } - - @Override - public final Condition lessOrEqualAll(Select query) { - return lessOrEqual(all(query)); - } - - @Override - public final Condition lessOrEqualAll(T... array) { - return lessOrEqual(all(array)); - } - - @Override - public final Condition lessOrEqualAll(Field array) { - return lessOrEqual(all(array)); - } - @Override public final Condition greaterThan(T value) { return greaterThan(val(value, this)); @@ -1017,36 +895,6 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return new QuantifiedComparisonCondition(query, this, Comparator.GREATER); } - @Override - public final Condition greaterThanAny(Select query) { - return greaterThan(any(query)); - } - - @Override - public final Condition greaterThanAny(T... array) { - return greaterThan(any(array)); - } - - @Override - public final Condition greaterThanAny(Field array) { - return greaterThan(any(array)); - } - - @Override - public final Condition greaterThanAll(Select query) { - return greaterThan(all(query)); - } - - @Override - public final Condition greaterThanAll(T... array) { - return greaterThan(all(array)); - } - - @Override - public final Condition greaterThanAll(Field array) { - return greaterThan(all(array)); - } - @Override public final Condition greaterOrEqual(T value) { return greaterOrEqual(val(value, this)); @@ -1067,36 +915,6 @@ abstract class AbstractField extends AbstractQueryPart implements Field { return new QuantifiedComparisonCondition(query, this, Comparator.GREATER_OR_EQUAL); } - @Override - public final Condition greaterOrEqualAny(Select query) { - return greaterOrEqual(any(query)); - } - - @Override - public final Condition greaterOrEqualAny(T... array) { - return greaterOrEqual(any(array)); - } - - @Override - public final Condition greaterOrEqualAny(Field array) { - return greaterOrEqual(any(array)); - } - - @Override - public final Condition greaterOrEqualAll(Select query) { - return greaterOrEqual(all(query)); - } - - @Override - public final Condition greaterOrEqualAll(T... array) { - return greaterOrEqual(all(array)); - } - - @Override - public final Condition greaterOrEqualAll(Field array) { - return greaterOrEqual(all(array)); - } - @Override public final Condition compare(Comparator comparator, T value) { return compare(comparator, val(value, this));