Upgrade jooq in misk and re-generate test jooq classes

GitOrigin-RevId: 81c1855eaf846a65e63a559adc8ca6d6b39f6792

gradle/libs.versions.toml

@@ -131,7 +131,7 @@ jettyUtil = { module = "org.eclipse.jetty:jetty-util" }
 jettyWebsocketApi = { module = "org.eclipse.jetty.websocket:websocket-jetty-api" }
 jettyWebsocketServer = { module = "org.eclipse.jetty.websocket:websocket-jetty-server" }
 jnrUnixsocket = { module = "com.github.jnr:jnr-unixsocket", version = "0.38.23" }
-jooq = { module = "org.jooq:jooq", version = "3.18.25" }
+jooq = { module = "org.jooq:jooq", version = "3.19.11" }
 jsqlparser = { module = "com.github.jsqlparser:jsqlparser", version = "5.1" }
 junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }

misk-jooq/README.md

@@ -37,7 +37,6 @@ miskSchemaMigrator {
 }
 // More details about the jooq plugin here - https://github.com/etiennestuder/gradle-jooq-plugin
 jooq {
-  version.set("3.14.8")
   edition.set(nu.studer.gradle.jooq.JooqEdition.OSS)
 
   configurations {

misk-jooq/api/misk-jooq.api

@@ -187,21 +187,19 @@ public class misk/jooq/testgen/tables/Movie : org/jooq/impl/TableImpl {
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/String;)V
 	public fun <init> (Lorg/jooq/Name;)V
-	public fun <init> (Lorg/jooq/Name;Lorg/jooq/Table;Lorg/jooq/ForeignKey;Lorg/jooq/Table;[Lorg/jooq/Field;)V
-	public fun <init> (Lorg/jooq/Table;Lorg/jooq/ForeignKey;)V
+	public fun <init> (Lorg/jooq/Name;Lorg/jooq/Table;Lorg/jooq/ForeignKey;Lorg/jooq/InverseForeignKey;Lorg/jooq/Table;[Lorg/jooq/Field;Lorg/jooq/Condition;)V
 	public fun as (Ljava/lang/String;)Lmisk/jooq/testgen/tables/Movie;
 	public synthetic fun as (Ljava/lang/String;)Lorg/jooq/SelectField;
 	public synthetic fun as (Ljava/lang/String;)Lorg/jooq/Table;
 	public fun as (Lorg/jooq/Name;)Lmisk/jooq/testgen/tables/Movie;
 	public synthetic fun as (Lorg/jooq/Name;)Lorg/jooq/SelectField;
 	public synthetic fun as (Lorg/jooq/Name;)Lorg/jooq/Table;
-	public fun fieldsRow ()Lorg/jooq/Row6;
-	public synthetic fun fieldsRow ()Lorg/jooq/Row;
+	public fun as (Lorg/jooq/Table;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun as (Lorg/jooq/Table;)Lorg/jooq/Table;
 	public final fun getCREATED_AT ()Lorg/jooq/TableField;
 	public final fun getGENRE ()Lorg/jooq/TableField;
 	public final fun getID ()Lorg/jooq/TableField;
 	public fun getIdentity ()Lorg/jooq/Identity;
-	public fun getKeys ()Ljava/util/List;
 	public final fun getNAME ()Lorg/jooq/TableField;
 	public fun getPrimaryKey ()Lorg/jooq/UniqueKey;
 	public fun getRecordType ()Ljava/lang/Class;
@@ -213,80 +211,52 @@ public class misk/jooq/testgen/tables/Movie : org/jooq/impl/TableImpl {
 	public synthetic fun rename (Ljava/lang/String;)Lorg/jooq/Table;
 	public fun rename (Lorg/jooq/Name;)Lmisk/jooq/testgen/tables/Movie;
 	public synthetic fun rename (Lorg/jooq/Name;)Lorg/jooq/Table;
+	public fun rename (Lorg/jooq/Table;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun rename (Lorg/jooq/Table;)Lorg/jooq/Table;
+	public fun where (Ljava/lang/String;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Ljava/lang/String;)Lorg/jooq/Table;
+	public fun where (Ljava/lang/String;[Ljava/lang/Object;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Ljava/lang/String;[Ljava/lang/Object;)Lorg/jooq/Table;
+	public fun where (Ljava/lang/String;[Lorg/jooq/QueryPart;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Ljava/lang/String;[Lorg/jooq/QueryPart;)Lorg/jooq/Table;
+	public fun where (Ljava/util/Collection;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Ljava/util/Collection;)Lorg/jooq/Table;
+	public fun where (Lorg/jooq/Condition;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Lorg/jooq/Condition;)Lorg/jooq/Table;
+	public fun where (Lorg/jooq/Field;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Lorg/jooq/Field;)Lorg/jooq/Table;
+	public fun where (Lorg/jooq/SQL;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where (Lorg/jooq/SQL;)Lorg/jooq/Table;
+	public fun where ([Lorg/jooq/Condition;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun where ([Lorg/jooq/Condition;)Lorg/jooq/Table;
+	public fun whereExists (Lorg/jooq/Select;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun whereExists (Lorg/jooq/Select;)Lorg/jooq/Table;
+	public fun whereNotExists (Lorg/jooq/Select;)Lmisk/jooq/testgen/tables/Movie;
+	public synthetic fun whereNotExists (Lorg/jooq/Select;)Lorg/jooq/Table;
 }
 
 public final class misk/jooq/testgen/tables/Movie$Companion {
 	public final fun getMOVIE ()Lmisk/jooq/testgen/tables/Movie;
 }
 
-public class misk/jooq/testgen/tables/records/MovieRecord : org/jooq/impl/UpdatableRecordImpl, org/jooq/Record6 {
+public class misk/jooq/testgen/tables/records/MovieRecord : org/jooq/impl/UpdatableRecordImpl {
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/time/LocalDateTime;Ljava/time/LocalDateTime;)V
 	public synthetic fun <init> (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/time/LocalDateTime;Ljava/time/LocalDateTime;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun component1 ()Ljava/lang/Long;
-	public synthetic fun component1 ()Ljava/lang/Object;
-	public synthetic fun component2 ()Ljava/lang/Object;
-	public fun component2 ()Ljava/lang/String;
-	public synthetic fun component3 ()Ljava/lang/Object;
-	public fun component3 ()Ljava/lang/String;
-	public fun component4 ()Ljava/lang/Integer;
-	public synthetic fun component4 ()Ljava/lang/Object;
-	public synthetic fun component5 ()Ljava/lang/Object;
-	public fun component5 ()Ljava/time/LocalDateTime;
-	public synthetic fun component6 ()Ljava/lang/Object;
-	public fun component6 ()Ljava/time/LocalDateTime;
-	public fun field1 ()Lorg/jooq/Field;
-	public fun field2 ()Lorg/jooq/Field;
-	public fun field3 ()Lorg/jooq/Field;
-	public fun field4 ()Lorg/jooq/Field;
-	public fun field5 ()Lorg/jooq/Field;
-	public fun field6 ()Lorg/jooq/Field;
-	public fun fieldsRow ()Lorg/jooq/Row6;
-	public synthetic fun fieldsRow ()Lorg/jooq/Row;
-	public final fun getCreatedAt ()Ljava/time/LocalDateTime;
-	public final fun getGenre ()Ljava/lang/String;
-	public final fun getId ()Ljava/lang/Long;
-	public final fun getName ()Ljava/lang/String;
-	public final fun getUpdatedAt ()Ljava/time/LocalDateTime;
-	public final fun getVersion ()Ljava/lang/Integer;
+	public fun getCreatedAt ()Ljava/time/LocalDateTime;
+	public fun getGenre ()Ljava/lang/String;
+	public fun getId ()Ljava/lang/Long;
+	public fun getName ()Ljava/lang/String;
+	public fun getUpdatedAt ()Ljava/time/LocalDateTime;
+	public fun getVersion ()Ljava/lang/Integer;
 	public fun key ()Lorg/jooq/Record1;
 	public synthetic fun key ()Lorg/jooq/Record;
-	public final fun setCreatedAt (Ljava/time/LocalDateTime;)V
-	public final fun setGenre (Ljava/lang/String;)V
-	public final fun setId (Ljava/lang/Long;)V
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setUpdatedAt (Ljava/time/LocalDateTime;)V
-	public final fun setVersion (Ljava/lang/Integer;)V
-	public fun value1 ()Ljava/lang/Long;
-	public synthetic fun value1 ()Ljava/lang/Object;
-	public fun value1 (Ljava/lang/Long;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public synthetic fun value1 (Ljava/lang/Object;)Lorg/jooq/Record6;
-	public synthetic fun value2 ()Ljava/lang/Object;
-	public fun value2 ()Ljava/lang/String;
-	public synthetic fun value2 (Ljava/lang/Object;)Lorg/jooq/Record6;
-	public fun value2 (Ljava/lang/String;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public synthetic fun value3 ()Ljava/lang/Object;
-	public fun value3 ()Ljava/lang/String;
-	public synthetic fun value3 (Ljava/lang/Object;)Lorg/jooq/Record6;
-	public fun value3 (Ljava/lang/String;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public fun value4 ()Ljava/lang/Integer;
-	public synthetic fun value4 ()Ljava/lang/Object;
-	public fun value4 (Ljava/lang/Integer;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public synthetic fun value4 (Ljava/lang/Object;)Lorg/jooq/Record6;
-	public synthetic fun value5 ()Ljava/lang/Object;
-	public fun value5 ()Ljava/time/LocalDateTime;
-	public synthetic fun value5 (Ljava/lang/Object;)Lorg/jooq/Record6;
-	public fun value5 (Ljava/time/LocalDateTime;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public synthetic fun value6 ()Ljava/lang/Object;
-	public fun value6 ()Ljava/time/LocalDateTime;
-	public synthetic fun value6 (Ljava/lang/Object;)Lorg/jooq/Record6;
-	public fun value6 (Ljava/time/LocalDateTime;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public fun values (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/time/LocalDateTime;Ljava/time/LocalDateTime;)Lmisk/jooq/testgen/tables/records/MovieRecord;
-	public synthetic fun values (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/jooq/Record6;
-	public fun valuesRow ()Lorg/jooq/Row6;
-	public synthetic fun valuesRow ()Lorg/jooq/Row;
-	public synthetic fun with (Lorg/jooq/Field;Ljava/lang/Object;)Lorg/jooq/Record6;
-	public synthetic fun with (Lorg/jooq/Field;Ljava/lang/Object;Lorg/jooq/Converter;)Lorg/jooq/Record6;
+	public fun setCreatedAt (Ljava/time/LocalDateTime;)V
+	public fun setGenre (Ljava/lang/String;)V
+	public fun setId (Ljava/lang/Long;)V
+	public fun setName (Ljava/lang/String;)V
+	public fun setUpdatedAt (Ljava/time/LocalDateTime;)V
+	public fun setVersion (Ljava/lang/Integer;)V
 }
 
 public final class misk/jooq/testgen/tables/references/TablesKt {

misk-jooq/build.gradle.kts

@@ -48,7 +48,6 @@ flyway {
 }
 // Needed to generate jooq test db classes
 jooq {
-  version.set("3.18.2")
   edition.set(nu.studer.gradle.jooq.JooqEdition.OSS)
 
   configurations {

misk-jooq/src/test/generated/kotlin/misk/jooq/testgen/DefaultCatalog.kt

@@ -4,12 +4,12 @@
 package misk.jooq.testgen
 
 
+import org.jooq.Constants
 import kotlin.collections.List
 
 import org.jooq.Schema
 import org.jooq.impl.CatalogImpl
 
-
 /**
  * This class is generated by jOOQ.
  */
@@ -20,15 +20,23 @@ open class DefaultCatalog : CatalogImpl("") {
         /**
          * The reference instance of <code>DEFAULT_CATALOG</code>
          */
-        val DEFAULT_CATALOG = DefaultCatalog()
+        public val DEFAULT_CATALOG: DefaultCatalog = DefaultCatalog()
     }
 
     /**
      * The schema <code>jooq</code>.
      */
-    val JOOQ get() = Jooq.JOOQ
+    val JOOQ: Jooq get(): Jooq = Jooq.JOOQ
 
     override fun getSchemas(): List<Schema> = listOf(
-        Jooq.JOOQ
+      Jooq.JOOQ
     )
+
+    /**
+     * A reference to the 3.19 minor release of the code generator. If this
+     * doesn't compile, it's because the runtime library uses an older minor
+     * release, namely: 3.19. You can turn off the generation of this reference
+     * by specifying /configuration/generator/generate/jooqVersionReference
+     */
+    private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_19
 }

misk-jooq/src/test/generated/kotlin/misk/jooq/testgen/Jooq.kt

@@ -18,18 +18,18 @@ import org.jooq.impl.SchemaImpl
  */
 @Suppress("UNCHECKED_CAST")
 open class Jooq : SchemaImpl("jooq", DefaultCatalog.DEFAULT_CATALOG) {
-    companion object {
+    public companion object {
 
         /**
          * The reference instance of <code>jooq</code>
          */
-        val JOOQ = Jooq()
+        val JOOQ: Jooq = Jooq()
     }
 
     /**
      * The table <code>jooq.movie</code>.
      */
-    val MOVIE get() = Movie.MOVIE
+    val MOVIE: Movie get() = Movie.MOVIE
 
     override fun getCatalog(): Catalog = DefaultCatalog.DEFAULT_CATALOG
 

misk-jooq/src/test/generated/kotlin/misk/jooq/testgen/keys/Keys.kt

@@ -17,4 +17,6 @@ import org.jooq.impl.Internal
 // UNIQUE and PRIMARY KEY definitions
 // -------------------------------------------------------------------------
 
-val KEY_MOVIE_PRIMARY: UniqueKey<MovieRecord> = Internal.createUniqueKey(Movie.MOVIE, DSL.name("KEY_movie_PRIMARY"), arrayOf(Movie.MOVIE.ID), true)
+val KEY_MOVIE_PRIMARY: UniqueKey<MovieRecord> = Internal.createUniqueKey(
+  Movie.MOVIE, DSL.name("KEY_movie_PRIMARY"), arrayOf(
+    Movie.MOVIE.ID), true)