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

[jOOQ/jOOQ#12109] Remove pre 3.6 deprecated API

Browse Source
This commit is contained in:
Lukas Eder 2021-07-06 21:07:35 +02:00
parent d80ccddec0
commit bb248cf4e0
5 changed files with 0 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,6 @@ import static org.jooq.SQLDialect.MYSQL;
import static org.jooq.SQLDialect.POSTGRES;
// ...
// ...
import static org.jooq.SQLDialect.SQL99;
// ...
import static org.jooq.SQLDialect.SQLITE;
// ...
@ -180,7 +179,6 @@ public @interface Allow {
CUBRID,
DEFAULT,
SQL99,
DERBY,
FIREBIRD,
H2,

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

@ -2182,13 +2182,6 @@ public interface Result<R extends Record> extends Fields, List<R>, Attachable, F
@NotNull
<E, S extends Record> Map<S, List<E>> intoGroups(Table<S> table, RecordMapper<? super R, E> mapper) throws IllegalArgumentException, MappingException;
/**
* @deprecated - 3.6.0 - [#3879] - Use {@link #intoArrays()} instead.
*/
@NotNull
@Deprecated(forRemoval = true, since = "3.6")
Object[][] intoArray();
/**
* Convert this result into an array of arrays.
* <p>

9
jOOQ/src/main/java/org/jooq/SQLDialect.java
View File

@ -77,15 +77,6 @@ import org.jetbrains.annotations.Nullable;
*/
public enum SQLDialect {
/**
* The standard SQL dialect family.
*
* @deprecated - [#3844] - 3.6.0 - {@link #DEFAULT} will replace this
* pseudo-dialect.
*/
@Deprecated
SQL99("", false, false),
/**
* The default SQL dialect.
* <p>

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

@ -11780,30 +11780,6 @@ public class DSL {
return default_(field.getDataType());
}
/**
* Create a qualified schema, given its schema name.
* <p>
* This constructs a schema reference given the schema's qualified name.
* <p>
* Example: <code><pre>
* // This schema...
* schemaByName("MY_SCHEMA");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA]
* </pre></code>
*
* @param name The schema's reference name.
* @return A schema referenced by <code>name</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #schema(Name)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
public static Schema schemaByName(String name) {
return new SchemaImpl(name);
}
/**
* Create a qualified catalog, given its catalog name.
* <p>
@ -11880,83 +11856,6 @@ public class DSL {
return new SchemaImpl(name);
}
/**
* Create a qualified sequence, given its sequence name.
* <p>
* This constructs a sequence reference given the sequence's qualified name.
* <p>
* Example: <code><pre>
* // This sequence...
* sequenceByName("MY_SCHEMA", "MY_SEQUENCE");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_SEQUENCE]
* </pre></code>
*
* @param qualifiedName The various parts making up your sequence's
* reference name.
* @return A sequence referenced by <code>sequenceName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #sequence(Name)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
public static Sequence<BigInteger> sequenceByName(String... qualifiedName) {
return sequenceByName(BigInteger.class, qualifiedName);
}
/**
* Create a qualified sequence, given its sequence name.
* <p>
* This constructs a sequence reference given the sequence's qualified name.
* <p>
* Example: <code><pre>
* // This sequence...
* sequenceByName("MY_SCHEMA", "MY_SEQUENCE");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_SEQUENCE]
* </pre></code>
*
* @param qualifiedName The various parts making up your sequence's
* reference name.
* @param type The type of the returned field
* @return A sequence referenced by <code>sequenceName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #sequence(Name, Class)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
public static <T extends Number> Sequence<T> sequenceByName(Class<T> type, String... qualifiedName) {
return sequenceByName(getDataType(type), qualifiedName);
}
/**
* Create a qualified sequence, given its sequence name.
* <p>
* This constructs a sequence reference given the sequence's qualified name.
* <p>
* Example: <code><pre>
* // This sequence...
* sequenceByName("MY_SCHEMA", "MY_SEQUENCE");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_SEQUENCE]
* </pre></code>
*
* @param qualifiedName The various parts making up your sequence's
* reference name.
* @param type The type of the returned field
* @return A sequence referenced by <code>sequenceName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #sequence(Name, DataType)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES })
public static <T extends Number> Sequence<T> sequenceByName(DataType<T> type, String... qualifiedName) {
return sequence(name(qualifiedName), type);
}
/**
* Create a qualified sequence, given its sequence name.
* <p>
@ -12019,31 +11918,6 @@ public class DSL {
);
}
/**
* Create a qualified table, given its table name.
* <p>
* This constructs a table reference given the table's qualified name. jOOQ
* <p>
* Example: <code><pre>
* // This table...
* tableByName("MY_SCHEMA", "MY_TABLE");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_TABLE]
* </pre></code>
*
* @param qualifiedName The various parts making up your table's reference
* name.
* @return A table referenced by <code>tableName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #table(Name)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
public static Table<Record> tableByName(String... qualifiedName) {
return table(name(qualifiedName));
}
/**
* Create a qualified table, given its table name.
* <p>
@ -12088,110 +11962,6 @@ public class DSL {
return new TableImpl<>(name, null, null, null, comment);
}
/**
* Create a qualified field, given its (qualified) field name.
* <p>
* This constructs a field reference given the field's qualified name. jOOQ
* <p>
* Example: <code><pre>
* // This field...
* fieldByName("MY_SCHEMA", "MY_TABLE", "MY_FIELD");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_TABLE].[MY_FIELD]
* </pre></code>
* <p>
* Another example: <code><pre>
* create.select(field("length({1})", Integer.class, fieldByName("TITLE")))
* .from(tableByName("T_BOOK"))
* .fetch();
*
* // ... will execute this SQL on SQL Server:
* select length([TITLE]) from [T_BOOK]
* </pre></code>
*
* @param qualifiedName The various parts making up your field's reference
* name.
* @return A field referenced by <code>fieldName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #field(Name)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
public static Field<Object> fieldByName(String... qualifiedName) {
return fieldByName(Object.class, qualifiedName);
}
/**
* Create a qualified field, given its (qualified) field name.
* <p>
* This constructs a field reference given the field's qualified name. jOOQ
* <p>
* Example: <code><pre>
* // This field...
* fieldByName("MY_SCHEMA", "MY_TABLE", "MY_FIELD");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_TABLE].[MY_FIELD]
* </pre></code>
* <p>
* Another example: <code><pre>
* create.select(field("length({1})", Integer.class, fieldByName("TITLE")))
* .from(tableByName("T_BOOK"))
* .fetch();
*
* // ... will execute this SQL on SQL Server:
* select length([TITLE]) from [T_BOOK]
* </pre></code>
*
* @param qualifiedName The various parts making up your field's reference
* name.
* @param type The type of the returned field
* @return A field referenced by <code>fieldName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #field(Name, Class)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
public static <T> Field<T> fieldByName(Class<T> type, String... qualifiedName) {
return fieldByName(getDataType(type), qualifiedName);
}
/**
* Create a qualified field, given its (qualified) field name.
* <p>
* This constructs a field reference given the field's qualified name. jOOQ
* <p>
* Example: <code><pre>
* // This field...
* fieldByName("MY_SCHEMA", "MY_TABLE", "MY_FIELD");
*
* // ... will render this SQL by default, using the SQL Server dialect
* [MY_SCHEMA].[MY_TABLE].[MY_FIELD]
* </pre></code>
* <p>
* Another example: <code><pre>
* create.select(field("length({1})", Integer.class, fieldByName("TITLE")))
* .from(tableByName("T_BOOK"))
* .fetch();
*
* // ... will execute this SQL on SQL Server:
* select length([TITLE]) from [T_BOOK]
* </pre></code>
*
* @param qualifiedName The various parts making up your field's reference
* name.
* @param type The type of the returned field
* @return A field referenced by <code>fieldName</code>
* @deprecated - [#3843] - 3.6.0 - use {@link #field(Name, DataType)} instead
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
public static <T> Field<T> fieldByName(DataType<T> type, String... qualifiedName) {
return field(name(qualifiedName), type);
}
/**
* Create a qualified field, given its (qualified) field name.
* <p>
@ -13121,87 +12891,6 @@ public class DSL {
return new SQLImpl(sql, bindings);
}
/**
* A custom SQL clause that can render arbitrary expressions.
* <p>
* A plain SQL <code>QueryPart</code> is a <code>QueryPart</code> that can
* contain user-defined plain SQL, because sometimes it is easier to express
* things directly in SQL.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
* escape literals when concatenated into SQL clauses!
*
* @param sql The SQL
* @return A query part wrapping the plain SQL
* @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String)} instead
* @see SQL
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
@PlainSQL
public static QueryPart queryPart(String sql) {
return sql(sql);
}
/**
* A custom SQL clause that can render arbitrary expressions.
* <p>
* A plain SQL <code>QueryPart</code> is a <code>QueryPart</code> that can
* contain user-defined plain SQL, because sometimes it is easier to express
* things directly in SQL.
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
* escape literals when concatenated into SQL clauses!
*
* @param sql The SQL clause, containing {numbered placeholders} where query
* parts can be injected
* @param parts The {@link QueryPart} objects that are rendered at the
* {numbered placeholder} locations
* @return A query part wrapping the plain SQL
* @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String, QueryPart...)} instead
* @see SQL
* @see DSL#sql(String, QueryPart...)
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
@PlainSQL
public static QueryPart queryPart(String sql, QueryPart... parts) {
return sql(sql, parts);
}
/**
* A custom SQL clause that can render arbitrary expressions.
* <p>
* A plain SQL <code>QueryPart</code> is a <code>QueryPart</code> that can
* contain user-defined plain SQL, because sometimes it is easier to express
* things directly in SQL. There must be as many bind variables contained
* in the SQL, as passed in the bindings parameter
* <p>
* <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
* guarantee syntax integrity. You may also create the possibility of
* malicious SQL injection. Be sure to properly use bind variables and/or
* escape literals when concatenated into SQL clauses!
*
* @param sql The SQL
* @return A query part wrapping the plain SQL
* @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String, Object...)} instead
* @see SQL
* @see DSL#sql(String, Object...)
*/
@Deprecated(forRemoval = true, since = "3.6")
@NotNull
@Support
@PlainSQL
public static QueryPart queryPart(String sql, Object... bindings) {
return sql(sql, bindings);
}
// -------------------------------------------------------------------------
// XXX Plain SQL API
// -------------------------------------------------------------------------

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

@ -664,12 +664,6 @@ final class ResultImpl<R extends Record> extends AbstractResult<R> implements Re
return collect(Records.intoGroups(recordType().mapper(table), mapper));
}
@Override
@Deprecated
public final Object[][] intoArray() {
return intoArrays();
}
@Override
public final Object[][] intoArrays() {
return collect(Records.intoArray(new Object[0][], R::intoArray));