From 4474ad4d4325f1a8a3fbaab972b4b48b06e7745e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 1 Oct 2025 11:18:08 +0200 Subject: [PATCH] Release 3.20.8 --- jOOQ-beans-extensions/pom.xml | 2 +- jOOQ-bom/pom.xml | 2 +- jOOQ-checker/pom.xml | 2 +- jOOQ-codegen-gradle/build.gradle.kts | 2 +- jOOQ-codegen-maven/pom.xml | 2 +- jOOQ-codegen/pom.xml | 2 +- .../src/main/java/org/jooq/codegen/Constants.java | 4 ++-- jOOQ-jackson-extensions/pom.xml | 2 +- jOOQ-jpa-extensions/pom.xml | 2 +- jOOQ-kotlin-coroutines/pom.xml | 2 +- jOOQ-kotlin/pom.xml | 2 +- jOOQ-meta-extensions-hibernate/pom.xml | 2 +- jOOQ-meta-extensions-liquibase/pom.xml | 2 +- jOOQ-meta-extensions/pom.xml | 2 +- jOOQ-meta-kotlin/pom.xml | 2 +- jOOQ-meta/pom.xml | 2 +- .../src/main/java/org/jooq/meta/Constants.java | 4 ++-- jOOQ-migrations-maven/pom.xml | 2 +- jOOQ-migrations/pom.xml | 2 +- jOOQ-postgres-extensions/pom.xml | 2 +- jOOQ-reactor-extensions/pom.xml | 2 +- jOOQ-scala_3.5/pom.xml | 2 +- jOOQ-xtend/pom.xml | 2 +- jOOQ/pom.xml | 2 +- jOOQ/src/main/java/org/jooq/Constants.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/MetaImpl.java | 15 +++++++++++---- pom.xml | 2 +- 27 files changed, 40 insertions(+), 33 deletions(-) diff --git a/jOOQ-beans-extensions/pom.xml b/jOOQ-beans-extensions/pom.xml index 8d15b2c7e1..5080b93d42 100644 --- a/jOOQ-beans-extensions/pom.xml +++ b/jOOQ-beans-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-beans-extensions diff --git a/jOOQ-bom/pom.xml b/jOOQ-bom/pom.xml index becb403361..f7748a2978 100644 --- a/jOOQ-bom/pom.xml +++ b/jOOQ-bom/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-bom diff --git a/jOOQ-checker/pom.xml b/jOOQ-checker/pom.xml index 8f42169df2..f088a1fbb2 100644 --- a/jOOQ-checker/pom.xml +++ b/jOOQ-checker/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-checker diff --git a/jOOQ-codegen-gradle/build.gradle.kts b/jOOQ-codegen-gradle/build.gradle.kts index 6316bea81c..b3233fbada 100644 --- a/jOOQ-codegen-gradle/build.gradle.kts +++ b/jOOQ-codegen-gradle/build.gradle.kts @@ -17,7 +17,7 @@ repositories { } group = "org.jooq" -version = "3.20.8-SNAPSHOT" +version = "3.20.8" dependencies { implementation(gradleApi()) diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 59ee9564f8..65ecb14eb8 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-codegen-maven diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 934c29e8bc..d595d0c92b 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-codegen diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java index 9cc16da50f..27386659ca 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java @@ -61,7 +61,7 @@ public final class Constants { * This is the same as {@link #MINOR_VERSION}, but it may include patch * version suffixes. */ - public static final String VERSION = "3.20.8-SNAPSHOT"; + public static final String VERSION = "3.20.8"; /** * The latest jOOQ full version. @@ -69,7 +69,7 @@ public final class Constants { * This is the same as {@link #VERSION}, but it may include release * candidate and other suffixes. */ - public static final String FULL_VERSION = "3.20.8-SNAPSHOT"; + public static final String FULL_VERSION = "3.20.8"; /** * The build date of this version. diff --git a/jOOQ-jackson-extensions/pom.xml b/jOOQ-jackson-extensions/pom.xml index 08e22a3a94..bd3a04a353 100644 --- a/jOOQ-jackson-extensions/pom.xml +++ b/jOOQ-jackson-extensions/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-jackson-extensions diff --git a/jOOQ-jpa-extensions/pom.xml b/jOOQ-jpa-extensions/pom.xml index 26d3d11227..87add1b355 100644 --- a/jOOQ-jpa-extensions/pom.xml +++ b/jOOQ-jpa-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-jpa-extensions diff --git a/jOOQ-kotlin-coroutines/pom.xml b/jOOQ-kotlin-coroutines/pom.xml index 8c49887ff4..69c6e4edbf 100644 --- a/jOOQ-kotlin-coroutines/pom.xml +++ b/jOOQ-kotlin-coroutines/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-kotlin-coroutines diff --git a/jOOQ-kotlin/pom.xml b/jOOQ-kotlin/pom.xml index e2f978b80e..76e3a8c1cd 100644 --- a/jOOQ-kotlin/pom.xml +++ b/jOOQ-kotlin/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-kotlin diff --git a/jOOQ-meta-extensions-hibernate/pom.xml b/jOOQ-meta-extensions-hibernate/pom.xml index 6d85c3ed7e..7ebf27eb9f 100644 --- a/jOOQ-meta-extensions-hibernate/pom.xml +++ b/jOOQ-meta-extensions-hibernate/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-meta-extensions-hibernate diff --git a/jOOQ-meta-extensions-liquibase/pom.xml b/jOOQ-meta-extensions-liquibase/pom.xml index 0c9bc25147..18f893c5d2 100644 --- a/jOOQ-meta-extensions-liquibase/pom.xml +++ b/jOOQ-meta-extensions-liquibase/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-meta-extensions-liquibase diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml index a3c411224c..5937f7bbf8 100644 --- a/jOOQ-meta-extensions/pom.xml +++ b/jOOQ-meta-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-meta-extensions diff --git a/jOOQ-meta-kotlin/pom.xml b/jOOQ-meta-kotlin/pom.xml index 4036a4c413..93f63050d5 100644 --- a/jOOQ-meta-kotlin/pom.xml +++ b/jOOQ-meta-kotlin/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-meta-kotlin diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index b4200da3a8..d3d57ae100 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-meta diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java index 50f6defc6d..c7d6eaa9ac 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java @@ -61,7 +61,7 @@ public final class Constants { * This is the same as {@link #MINOR_VERSION}, but it may include patch * version suffixes. */ - public static final String VERSION = "3.20.8-SNAPSHOT"; + public static final String VERSION = "3.20.8"; /** * The latest jOOQ full version. @@ -69,7 +69,7 @@ public final class Constants { * This is the same as {@link #VERSION}, but it may include release * candidate and other suffixes. */ - public static final String FULL_VERSION = "3.20.8-SNAPSHOT"; + public static final String FULL_VERSION = "3.20.8"; /** * The build date of this version. diff --git a/jOOQ-migrations-maven/pom.xml b/jOOQ-migrations-maven/pom.xml index dcd5eeb8d7..0421407c30 100644 --- a/jOOQ-migrations-maven/pom.xml +++ b/jOOQ-migrations-maven/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-migrations-maven diff --git a/jOOQ-migrations/pom.xml b/jOOQ-migrations/pom.xml index 17331d9366..02b8ae2e5e 100644 --- a/jOOQ-migrations/pom.xml +++ b/jOOQ-migrations/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-migrations diff --git a/jOOQ-postgres-extensions/pom.xml b/jOOQ-postgres-extensions/pom.xml index bc14da960d..45c6c9fe8e 100644 --- a/jOOQ-postgres-extensions/pom.xml +++ b/jOOQ-postgres-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-postgres-extensions diff --git a/jOOQ-reactor-extensions/pom.xml b/jOOQ-reactor-extensions/pom.xml index 42b0677180..d4f9567f2b 100644 --- a/jOOQ-reactor-extensions/pom.xml +++ b/jOOQ-reactor-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-reactor-extensions diff --git a/jOOQ-scala_3.5/pom.xml b/jOOQ-scala_3.5/pom.xml index 7ccd09b397..ec8233427c 100644 --- a/jOOQ-scala_3.5/pom.xml +++ b/jOOQ-scala_3.5/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-scala_3.5 diff --git a/jOOQ-xtend/pom.xml b/jOOQ-xtend/pom.xml index 6bb6df0aed..3537084100 100644 --- a/jOOQ-xtend/pom.xml +++ b/jOOQ-xtend/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq-xtend diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index b6a5c77194..70f44e217a 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 jooq diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 2346e79ceb..d95d6b363b 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -61,7 +61,7 @@ public final class Constants { * This is the same as {@link #MINOR_VERSION}, but it may include patch * version suffixes. */ - public static final String VERSION = "3.20.8-SNAPSHOT"; + public static final String VERSION = "3.20.8"; /** * The latest jOOQ full version. @@ -69,7 +69,7 @@ public final class Constants { * This is the same as {@link #VERSION}, but it may include release * candidate and other suffixes. */ - public static final String FULL_VERSION = "3.20.8-SNAPSHOT"; + public static final String FULL_VERSION = "3.20.8"; /** * The build date of this version. diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java index f806a8230d..8a814424ec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java @@ -110,6 +110,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; @@ -151,9 +152,11 @@ import org.jooq.exception.DataAccessException; import org.jooq.exception.DataDefinitionException; import org.jooq.exception.DataTypeException; import org.jooq.exception.SQLDialectNotSupportedException; +import org.jooq.impl.QOM.ForeignKeyRule; import org.jooq.impl.QOM.GenerationOption; import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; +import org.jooq.tools.jdbc.JDBCUtils; /** * An implementation of the public {@link Meta} type. @@ -1460,8 +1463,8 @@ final class MetaImpl extends AbstractMeta { new MetaUniqueKey(pkTable, pkName, pkFields, true), // TODO: Can we know whether it is a PK or UK? pkFields, true, - foreignKeyRule(k.get(4, int.class)), - foreignKeyRule(k.get(3, int.class)) + foreignKeyRule(k.get(4, Integer.class)), + foreignKeyRule(k.get(3, Integer.class)) )); } } @@ -1470,6 +1473,10 @@ final class MetaImpl extends AbstractMeta { return references; } + private final ForeignKeyRule foreignKeyRule(Integer code) { + return code == null ? null : JDBCUtils.foreignKeyRule(code); + } + @SuppressWarnings("unchecked") private final TableField lookup(Table table, String fieldName) { for (Field field : table.fields()) @@ -1899,8 +1906,8 @@ final class MetaImpl extends AbstractMeta { this, map(v, f -> (TableField) getTable().field(f.get(3, String.class)), TableField[]::new), true, - foreignKeyRule(k.get(4, int.class)), - foreignKeyRule(k.get(3, int.class)) + foreignKeyRule(k.get(4, Integer.class)), + foreignKeyRule(k.get(3, Integer.class)) )); }); diff --git a/pom.xml b/pom.xml index 40c3734ebd..a9c19976d7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.20.8-SNAPSHOT + 3.20.8 pom jOOQ Parent