From 402236b25a700f17ded7414a3dab668fb3a9acfe Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 20 Sep 2023 12:05:59 +0200 Subject: [PATCH] [jOOQ/jOOQ#15623] Stop using deprecated DSL API in jOOQ-meta --- .../main/java/org/jooq/meta/AbstractDatabase.java | 5 ----- .../meta/AbstractElementContainerDefinition.java | 2 -- .../java/org/jooq/meta/AbstractMetaDatabase.java | 1 - .../jooq/meta/AbstractTypedElementDefinition.java | 5 ----- .../main/java/org/jooq/meta/CatalogDefinition.java | 1 - .../meta/DefaultInverseForeignKeyDefinition.java | 2 -- .../main/java/org/jooq/meta/DefaultRelations.java | 1 - .../main/java/org/jooq/meta/ParameterDefinition.java | 1 + .../main/java/org/jooq/meta/SchemaDefinition.java | 1 - .../java/org/jooq/meta/cubrid/CUBRIDDatabase.java | 1 - .../org/jooq/meta/duckdb/DuckDBTableDefinition.java | 4 ++-- .../org/jooq/meta/duckdb/DuckDBUDTDefinition.java | 3 +-- .../org/jooq/meta/firebird/FirebirdDatabase.java | 2 +- .../meta/firebird/FirebirdRoutineDefinition.java | 12 +++++++----- .../jooq/meta/firebird/FirebirdTableDefinition.java | 4 +++- .../meta/firebird/FirebirdTableValuedFunction.java | 11 +++++++---- .../src/main/java/org/jooq/meta/h2/H2Database.java | 3 ++- .../java/org/jooq/meta/h2/H2RoutineDefinition.java | 2 -- .../java/org/jooq/meta/h2/H2TableDefinition.java | 6 +++--- .../java/org/jooq/meta/hsqldb/HSQLDBDatabase.java | 8 +++++--- .../main/java/org/jooq/meta/mysql/MySQLDatabase.java | 7 ++++--- .../org/jooq/meta/postgres/PostgresDatabase.java | 3 --- .../postgres/PostgresMaterializedViewDefinition.java | 3 --- .../meta/postgres/PostgresRoutineDefinition.java | 1 - .../meta/postgres/PostgresTableValuedFunction.java | 1 - .../jooq/meta/postgres/PostgresUDTDefinition.java | 8 -------- .../org/jooq/meta/sqlite/SQLiteTableDefinition.java | 3 ++- .../main/java/org/jooq/meta/trino/TrinoDatabase.java | 8 +++++--- .../src/main/java/org/jooq/meta/xml/XMLDatabase.java | 4 +--- 29 files changed, 44 insertions(+), 69 deletions(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java index 5543061159..26592fc57d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java @@ -43,7 +43,6 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Comparator.comparing; import static java.util.stream.Collectors.groupingBy; -import static java.util.stream.Collectors.toList; import static org.jooq.Log.Level.ERROR; // ... import static org.jooq.SQLDialect.CUBRID; @@ -82,7 +81,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -94,7 +92,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.jooq.Condition; @@ -112,14 +109,12 @@ import org.jooq.Parser; // ... import org.jooq.Query; import org.jooq.Record; -// ... import org.jooq.SQLDialect; import org.jooq.Schema; import org.jooq.Select; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions.TableType; -// ... import org.jooq.conf.ParseWithMetaLookups; import org.jooq.conf.RenderQuotedNames; import org.jooq.exception.DataAccessException; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractElementContainerDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractElementContainerDefinition.java index 046b6bafea..93ec630980 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractElementContainerDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractElementContainerDefinition.java @@ -51,8 +51,6 @@ import java.util.regex.Pattern; import org.jooq.DataType; // ... -import org.jooq.exception.SQLDialectNotSupportedException; -import org.jooq.impl.DefaultDataType; import org.jooq.impl.ParserException; import org.jooq.impl.SQLDataType; import org.jooq.meta.jaxb.SyntheticColumnType; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractMetaDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractMetaDatabase.java index 8466267284..e349a6ee0f 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractMetaDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractMetaDatabase.java @@ -40,7 +40,6 @@ package org.jooq.meta; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java index 6dd3458dd6..5bbf36e46c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java @@ -41,7 +41,6 @@ package org.jooq.meta; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; import static org.jooq.tools.Convert.convert; -import static org.jooq.tools.StringUtils.isBlank; import static org.jooq.tools.StringUtils.isEmpty; import java.math.BigDecimal; @@ -56,11 +55,9 @@ import org.jooq.Converter; import org.jooq.DataType; import org.jooq.GeneratorStatementType; import org.jooq.Name; -// ... import org.jooq.exception.SQLDialectNotSupportedException; // ... import org.jooq.impl.AutoConverter; -import org.jooq.impl.DSL; import org.jooq.impl.DateAsTimestampBinding; import org.jooq.impl.DefaultDataType; import org.jooq.impl.EnumConverter; @@ -70,7 +67,6 @@ import org.jooq.impl.XMLtoJAXBConverter; import org.jooq.meta.jaxb.CustomType; import org.jooq.meta.jaxb.ForcedType; import org.jooq.meta.jaxb.LambdaConverter; -import org.jooq.meta.jaxb.SyntheticEnumType; import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; @@ -84,7 +80,6 @@ public abstract class AbstractTypedElementDefinition private final T container; private final DataTypeDefinition definedType; private transient DataTypeDefinition type; - private transient DataTypeDefinition resolvedType; public AbstractTypedElementDefinition(T container, String name, int position, DataTypeDefinition definedType, String comment) { this(container, name, position, definedType, comment, null); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java index 441387f1f3..818d9ef7f2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/CatalogDefinition.java @@ -40,7 +40,6 @@ package org.jooq.meta; import static java.util.Arrays.asList; -import java.util.Arrays; import java.util.List; import org.jooq.tools.StringUtils; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultInverseForeignKeyDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultInverseForeignKeyDefinition.java index 228fbb3d21..fd454c00b0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultInverseForeignKeyDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultInverseForeignKeyDefinition.java @@ -39,8 +39,6 @@ package org.jooq.meta; import java.util.List; -import org.jooq.Name; - /** * @author Lukas Eder */ diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java index cefd991e1a..214bba33b5 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java @@ -40,7 +40,6 @@ package org.jooq.meta; import static java.util.Collections.emptyList; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/ParameterDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/ParameterDefinition.java index aca166df59..5614275089 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/ParameterDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/ParameterDefinition.java @@ -63,5 +63,6 @@ public interface ParameterDefinition extends TypedElementDefinition field) { - return exists1(field, COLUMNS.COLUMNS, COLUMNS.TABLE_SCHEMA, COLUMNS.TABLE_NAME, COLUMNS.COLUMN_NAME); + return exists1(field, COLUMNS, COLUMNS.TABLE_SCHEMA, COLUMNS.TABLE_NAME, COLUMNS.COLUMN_NAME); } @Override protected boolean exists0(Table table) { - return exists1(table, TABLES.TABLES, TABLES.TABLE_SCHEMA, TABLES.TABLE_NAME); + return exists1(table, TABLES, TABLES.TABLE_SCHEMA, TABLES.TABLE_NAME); } private List> workaroundFor5213(List inputSchemata) { diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java index 5a982abd64..22adcdcf2c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java @@ -138,7 +138,6 @@ import org.jooq.Result; import org.jooq.ResultQuery; import org.jooq.SQLDialect; import org.jooq.Select; -import org.jooq.SelectOrderByStep; import org.jooq.SortOrder; import org.jooq.Table; import org.jooq.TableField; @@ -190,8 +189,6 @@ import org.jooq.meta.postgres.pg_catalog.tables.PgInherits; import org.jooq.meta.postgres.pg_catalog.tables.PgType; import org.jooq.tools.JooqLogger; -import org.jetbrains.annotations.NotNull; - /** * Postgres uses the ANSI default INFORMATION_SCHEMA, but unfortunately ships * with a non-capitalised version of it: information_schema. Hence diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresMaterializedViewDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresMaterializedViewDefinition.java index ede9aeb38b..5356bbb26e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresMaterializedViewDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresMaterializedViewDefinition.java @@ -56,7 +56,6 @@ import static org.jooq.meta.postgres.pg_catalog.Tables.PG_DESCRIPTION; import static org.jooq.meta.postgres.pg_catalog.Tables.PG_NAMESPACE; import static org.jooq.meta.postgres.pg_catalog.Tables.PG_TYPE; import static org.jooq.tools.StringUtils.defaultString; -import static org.jooq.util.postgres.PostgresDSL.oid; import java.sql.SQLException; import java.util.ArrayList; @@ -80,8 +79,6 @@ import org.jooq.meta.postgres.pg_catalog.tables.PgCollation; import org.jooq.meta.postgres.pg_catalog.tables.PgNamespace; import org.jooq.meta.postgres.pg_catalog.tables.PgType; -import org.jetbrains.annotations.NotNull; - /** * @author Lukas Eder */ diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresRoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresRoutineDefinition.java index 8cfb145ec2..5da4cfd004 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresRoutineDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresRoutineDefinition.java @@ -45,7 +45,6 @@ import static org.jooq.impl.DSL.name; import static org.jooq.impl.DSL.partitionBy; import static org.jooq.impl.DSL.substring; import static org.jooq.impl.DSL.when; -import static org.jooq.meta.postgres.information_schema.Tables.COLUMNS; import static org.jooq.meta.postgres.information_schema.Tables.PARAMETERS; import static org.jooq.meta.postgres.information_schema.Tables.ROUTINES; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresTableValuedFunction.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresTableValuedFunction.java index 7b25f2ee8f..ee39923b18 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresTableValuedFunction.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresTableValuedFunction.java @@ -73,7 +73,6 @@ import org.jooq.meta.DefaultColumnDefinition; import org.jooq.meta.DefaultDataTypeDefinition; import org.jooq.meta.ParameterDefinition; import org.jooq.meta.SchemaDefinition; -import org.jooq.meta.TableDefinition; import org.jooq.meta.postgres.information_schema.tables.Columns; import org.jooq.meta.postgres.information_schema.tables.Parameters; import org.jooq.meta.postgres.information_schema.tables.Routines; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresUDTDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresUDTDefinition.java index 5a8299a5dd..dcfe368f42 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresUDTDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresUDTDefinition.java @@ -40,14 +40,10 @@ package org.jooq.meta.postgres; import static org.jooq.impl.DSL.coalesce; import static org.jooq.impl.DSL.inline; import static org.jooq.impl.DSL.name; -import static org.jooq.impl.DSL.substring; import static org.jooq.impl.DSL.when; import static org.jooq.meta.postgres.information_schema.Tables.ATTRIBUTES; -import static org.jooq.meta.postgres.information_schema.Tables.COLUMNS; import static org.jooq.meta.postgres.information_schema.Tables.DOMAINS; import static org.jooq.meta.postgres.pg_catalog.Tables.PG_ATTRIBUTE; -import static org.jooq.meta.postgres.pg_catalog.Tables.PG_CLASS; -import static org.jooq.meta.postgres.pg_catalog.Tables.PG_NAMESPACE; import java.sql.SQLException; import java.util.ArrayList; @@ -58,17 +54,13 @@ import org.jooq.Record; import org.jooq.meta.AbstractUDTDefinition; import org.jooq.meta.AttributeDefinition; import org.jooq.meta.DataTypeDefinition; -import org.jooq.meta.Database; import org.jooq.meta.DefaultAttributeDefinition; import org.jooq.meta.DefaultDataTypeDefinition; import org.jooq.meta.RoutineDefinition; import org.jooq.meta.SchemaDefinition; import org.jooq.meta.postgres.information_schema.tables.Attributes; import org.jooq.meta.postgres.information_schema.tables.Domains; -import org.jooq.meta.postgres.pg_catalog.Tables; import org.jooq.meta.postgres.pg_catalog.tables.PgAttribute; -import org.jooq.meta.postgres.pg_catalog.tables.PgClass; -import org.jooq.meta.postgres.pg_catalog.tables.PgNamespace; public class PostgresUDTDefinition extends AbstractUDTDefinition { diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteTableDefinition.java index 5c626b010f..d8298d5791 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteTableDefinition.java @@ -40,6 +40,7 @@ package org.jooq.meta.sqlite; import static org.jooq.conf.ParseWithMetaLookups.THROW_ON_FAILURE; import static org.jooq.impl.DSL.field; import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.lower; import static org.jooq.impl.DSL.name; import static org.jooq.impl.DSL.selectOne; import static org.jooq.impl.QOM.GenerationOption.STORED; @@ -236,7 +237,7 @@ public class SQLiteTableDefinition extends AbstractTableDefinition { existsSqliteSequence = create() .selectCount() .from(SQLITE_MASTER) - .where(SQLiteMaster.NAME.lower().eq("sqlite_sequence")) + .where(lower(SQLiteMaster.NAME).eq("sqlite_sequence")) .fetchOne(0, boolean.class); } diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/trino/TrinoDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/trino/TrinoDatabase.java index 6578d9d118..fb2e36b5b5 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/trino/TrinoDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/trino/TrinoDatabase.java @@ -40,6 +40,8 @@ package org.jooq.meta.trino; import static org.jooq.Records.mapping; import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.lower; +import static org.jooq.impl.DSL.trim; import static org.jooq.impl.DSL.when; import static org.jooq.meta.hsqldb.information_schema.Tables.SCHEMATA; import static org.jooq.meta.hsqldb.information_schema.Tables.TABLES; @@ -96,8 +98,8 @@ public class TrinoDatabase extends AbstractDatabase implements ResultQueryDataba .select( TABLES.TABLE_SCHEMA, TABLES.TABLE_NAME, - when(TABLES.TABLE_TYPE.eq(inline("VIEW")), inline(TableType.VIEW.name())) - .else_(inline(TableType.TABLE.name())).trim().as("table_type") + trim(when(TABLES.TABLE_TYPE.eq(inline("VIEW")), inline(TableType.VIEW.name())) + .else_(inline(TableType.TABLE.name()))).as("table_type") ) .from(TABLES) .where(TABLES.TABLE_SCHEMA.in(getInputSchemata())) @@ -159,7 +161,7 @@ public class TrinoDatabase extends AbstractDatabase implements ResultQueryDataba inline("").as(VIEWS.TABLE_CATALOG), VIEWS.TABLE_SCHEMA, VIEWS.TABLE_NAME, - when(VIEWS.VIEW_DEFINITION.lower().like(inline("create%")), VIEWS.VIEW_DEFINITION) + when(lower(VIEWS.VIEW_DEFINITION).like(inline("create%")), VIEWS.VIEW_DEFINITION) .else_(inline("create view \"").concat(VIEWS.TABLE_NAME).concat(inline("\" as ")).concat(VIEWS.VIEW_DEFINITION)).as(VIEWS.VIEW_DEFINITION) ) .from(VIEWS) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java index 61843a825c..ea3628c6e7 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java @@ -40,7 +40,6 @@ package org.jooq.meta.xml; import static java.lang.Boolean.FALSE; import static java.util.Arrays.asList; -import static java.util.Collections.emptySet; import static org.jooq.impl.DSL.name; import static org.jooq.tools.StringUtils.defaultIfBlank; import static org.jooq.tools.StringUtils.defaultIfNull; @@ -57,7 +56,6 @@ import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; @@ -84,10 +82,10 @@ import org.jooq.FilePattern.Sort; import org.jooq.Name; import org.jooq.SQLDialect; import org.jooq.SortOrder; -// ... import org.jooq.TableOptions.TableType; // ... // ... +// ... import org.jooq.exception.IOException; import org.jooq.impl.DSL; import org.jooq.meta.AbstractDatabase;