Skip to content

Commit c2faf7b

Browse files
mmollaverdisvc-squareup-copybara
mmollaverdi
authored and
svc-squareup-copybara
committed
Upgrade jooq in misk and re-generate test jooq classes
GitOrigin-RevId: 81c1855eaf846a65e63a559adc8ca6d6b39f6792
1 parent fe24704 commit c2faf7b

File tree

10 files changed

+162
-194
lines changed

10 files changed

+162
-194
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jettyUtil = { module = "org.eclipse.jetty:jetty-util" }
131131
jettyWebsocketApi = { module = "org.eclipse.jetty.websocket:websocket-jetty-api" }
132132
jettyWebsocketServer = { module = "org.eclipse.jetty.websocket:websocket-jetty-server" }
133133
jnrUnixsocket = { module = "com.github.jnr:jnr-unixsocket", version = "0.38.23" }
134-
jooq = { module = "org.jooq:jooq", version = "3.18.25" }
134+
jooq = { module = "org.jooq:jooq", version = "3.19.11" }
135135
jsqlparser = { module = "com.github.jsqlparser:jsqlparser", version = "5.1" }
136136
junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
137137
junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }

‎misk-jooq/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ miskSchemaMigrator {
3737
}
3838
// More details about the jooq plugin here - https://github.com/etiennestuder/gradle-jooq-plugin
3939
jooq {
40-
version.set("3.14.8")
4140
edition.set(nu.studer.gradle.jooq.JooqEdition.OSS)
4241
4342
configurations {

‎misk-jooq/api/misk-jooq.api‎

Lines changed: 38 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -187,21 +187,19 @@ public class misk/jooq/testgen/tables/Movie : org/jooq/impl/TableImpl {
187187
public fun <init> ()V
188188
public fun <init> (Ljava/lang/String;)V
189189
public fun <init> (Lorg/jooq/Name;)V
190-
public fun <init> (Lorg/jooq/Name;Lorg/jooq/Table;Lorg/jooq/ForeignKey;Lorg/jooq/Table;[Lorg/jooq/Field;)V
191-
public fun <init> (Lorg/jooq/Table;Lorg/jooq/ForeignKey;)V
190+
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
192191
public fun as (Ljava/lang/String;)Lmisk/jooq/testgen/tables/Movie;
193192
public synthetic fun as (Ljava/lang/String;)Lorg/jooq/SelectField;
194193
public synthetic fun as (Ljava/lang/String;)Lorg/jooq/Table;
195194
public fun as (Lorg/jooq/Name;)Lmisk/jooq/testgen/tables/Movie;
196195
public synthetic fun as (Lorg/jooq/Name;)Lorg/jooq/SelectField;
197196
public synthetic fun as (Lorg/jooq/Name;)Lorg/jooq/Table;
198-
public fun fieldsRow ()Lorg/jooq/Row6;
199-
public synthetic fun fieldsRow ()Lorg/jooq/Row;
197+
public fun as (Lorg/jooq/Table;)Lmisk/jooq/testgen/tables/Movie;
198+
public synthetic fun as (Lorg/jooq/Table;)Lorg/jooq/Table;
200199
public final fun getCREATED_AT ()Lorg/jooq/TableField;
201200
public final fun getGENRE ()Lorg/jooq/TableField;
202201
public final fun getID ()Lorg/jooq/TableField;
203202
public fun getIdentity ()Lorg/jooq/Identity;
204-
public fun getKeys ()Ljava/util/List;
205203
public final fun getNAME ()Lorg/jooq/TableField;
206204
public fun getPrimaryKey ()Lorg/jooq/UniqueKey;
207205
public fun getRecordType ()Ljava/lang/Class;
@@ -213,80 +211,52 @@ public class misk/jooq/testgen/tables/Movie : org/jooq/impl/TableImpl {
213211
public synthetic fun rename (Ljava/lang/String;)Lorg/jooq/Table;
214212
public fun rename (Lorg/jooq/Name;)Lmisk/jooq/testgen/tables/Movie;
215213
public synthetic fun rename (Lorg/jooq/Name;)Lorg/jooq/Table;
214+
public fun rename (Lorg/jooq/Table;)Lmisk/jooq/testgen/tables/Movie;
215+
public synthetic fun rename (Lorg/jooq/Table;)Lorg/jooq/Table;
216+
public fun where (Ljava/lang/String;)Lmisk/jooq/testgen/tables/Movie;
217+
public synthetic fun where (Ljava/lang/String;)Lorg/jooq/Table;
218+
public fun where (Ljava/lang/String;[Ljava/lang/Object;)Lmisk/jooq/testgen/tables/Movie;
219+
public synthetic fun where (Ljava/lang/String;[Ljava/lang/Object;)Lorg/jooq/Table;
220+
public fun where (Ljava/lang/String;[Lorg/jooq/QueryPart;)Lmisk/jooq/testgen/tables/Movie;
221+
public synthetic fun where (Ljava/lang/String;[Lorg/jooq/QueryPart;)Lorg/jooq/Table;
222+
public fun where (Ljava/util/Collection;)Lmisk/jooq/testgen/tables/Movie;
223+
public synthetic fun where (Ljava/util/Collection;)Lorg/jooq/Table;
224+
public fun where (Lorg/jooq/Condition;)Lmisk/jooq/testgen/tables/Movie;
225+
public synthetic fun where (Lorg/jooq/Condition;)Lorg/jooq/Table;
226+
public fun where (Lorg/jooq/Field;)Lmisk/jooq/testgen/tables/Movie;
227+
public synthetic fun where (Lorg/jooq/Field;)Lorg/jooq/Table;
228+
public fun where (Lorg/jooq/SQL;)Lmisk/jooq/testgen/tables/Movie;
229+
public synthetic fun where (Lorg/jooq/SQL;)Lorg/jooq/Table;
230+
public fun where ([Lorg/jooq/Condition;)Lmisk/jooq/testgen/tables/Movie;
231+
public synthetic fun where ([Lorg/jooq/Condition;)Lorg/jooq/Table;
232+
public fun whereExists (Lorg/jooq/Select;)Lmisk/jooq/testgen/tables/Movie;
233+
public synthetic fun whereExists (Lorg/jooq/Select;)Lorg/jooq/Table;
234+
public fun whereNotExists (Lorg/jooq/Select;)Lmisk/jooq/testgen/tables/Movie;
235+
public synthetic fun whereNotExists (Lorg/jooq/Select;)Lorg/jooq/Table;
216236
}
217237

218238
public final class misk/jooq/testgen/tables/Movie$Companion {
219239
public final fun getMOVIE ()Lmisk/jooq/testgen/tables/Movie;
220240
}
221241

222-
public class misk/jooq/testgen/tables/records/MovieRecord : org/jooq/impl/UpdatableRecordImpl, org/jooq/Record6 {
242+
public class misk/jooq/testgen/tables/records/MovieRecord : org/jooq/impl/UpdatableRecordImpl {
223243
public fun <init> ()V
224244
public fun <init> (Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/time/LocalDateTime;Ljava/time/LocalDateTime;)V
225245
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
226-
public fun component1 ()Ljava/lang/Long;
227-
public synthetic fun component1 ()Ljava/lang/Object;
228-
public synthetic fun component2 ()Ljava/lang/Object;
229-
public fun component2 ()Ljava/lang/String;
230-
public synthetic fun component3 ()Ljava/lang/Object;
231-
public fun component3 ()Ljava/lang/String;
232-
public fun component4 ()Ljava/lang/Integer;
233-
public synthetic fun component4 ()Ljava/lang/Object;
234-
public synthetic fun component5 ()Ljava/lang/Object;
235-
public fun component5 ()Ljava/time/LocalDateTime;
236-
public synthetic fun component6 ()Ljava/lang/Object;
237-
public fun component6 ()Ljava/time/LocalDateTime;
238-
public fun field1 ()Lorg/jooq/Field;
239-
public fun field2 ()Lorg/jooq/Field;
240-
public fun field3 ()Lorg/jooq/Field;
241-
public fun field4 ()Lorg/jooq/Field;
242-
public fun field5 ()Lorg/jooq/Field;
243-
public fun field6 ()Lorg/jooq/Field;
244-
public fun fieldsRow ()Lorg/jooq/Row6;
245-
public synthetic fun fieldsRow ()Lorg/jooq/Row;
246-
public final fun getCreatedAt ()Ljava/time/LocalDateTime;
247-
public final fun getGenre ()Ljava/lang/String;
248-
public final fun getId ()Ljava/lang/Long;
249-
public final fun getName ()Ljava/lang/String;
250-
public final fun getUpdatedAt ()Ljava/time/LocalDateTime;
251-
public final fun getVersion ()Ljava/lang/Integer;
246+
public fun getCreatedAt ()Ljava/time/LocalDateTime;
247+
public fun getGenre ()Ljava/lang/String;
248+
public fun getId ()Ljava/lang/Long;
249+
public fun getName ()Ljava/lang/String;
250+
public fun getUpdatedAt ()Ljava/time/LocalDateTime;
251+
public fun getVersion ()Ljava/lang/Integer;
252252
public fun key ()Lorg/jooq/Record1;
253253
public synthetic fun key ()Lorg/jooq/Record;
254-
public final fun setCreatedAt (Ljava/time/LocalDateTime;)V
255-
public final fun setGenre (Ljava/lang/String;)V
256-
public final fun setId (Ljava/lang/Long;)V
257-
public final fun setName (Ljava/lang/String;)V
258-
public final fun setUpdatedAt (Ljava/time/LocalDateTime;)V
259-
public final fun setVersion (Ljava/lang/Integer;)V
260-
public fun value1 ()Ljava/lang/Long;
261-
public synthetic fun value1 ()Ljava/lang/Object;
262-
public fun value1 (Ljava/lang/Long;)Lmisk/jooq/testgen/tables/records/MovieRecord;
263-
public synthetic fun value1 (Ljava/lang/Object;)Lorg/jooq/Record6;
264-
public synthetic fun value2 ()Ljava/lang/Object;
265-
public fun value2 ()Ljava/lang/String;
266-
public synthetic fun value2 (Ljava/lang/Object;)Lorg/jooq/Record6;
267-
public fun value2 (Ljava/lang/String;)Lmisk/jooq/testgen/tables/records/MovieRecord;
268-
public synthetic fun value3 ()Ljava/lang/Object;
269-
public fun value3 ()Ljava/lang/String;
270-
public synthetic fun value3 (Ljava/lang/Object;)Lorg/jooq/Record6;
271-
public fun value3 (Ljava/lang/String;)Lmisk/jooq/testgen/tables/records/MovieRecord;
272-
public fun value4 ()Ljava/lang/Integer;
273-
public synthetic fun value4 ()Ljava/lang/Object;
274-
public fun value4 (Ljava/lang/Integer;)Lmisk/jooq/testgen/tables/records/MovieRecord;
275-
public synthetic fun value4 (Ljava/lang/Object;)Lorg/jooq/Record6;
276-
public synthetic fun value5 ()Ljava/lang/Object;
277-
public fun value5 ()Ljava/time/LocalDateTime;
278-
public synthetic fun value5 (Ljava/lang/Object;)Lorg/jooq/Record6;
279-
public fun value5 (Ljava/time/LocalDateTime;)Lmisk/jooq/testgen/tables/records/MovieRecord;
280-
public synthetic fun value6 ()Ljava/lang/Object;
281-
public fun value6 ()Ljava/time/LocalDateTime;
282-
public synthetic fun value6 (Ljava/lang/Object;)Lorg/jooq/Record6;
283-
public fun value6 (Ljava/time/LocalDateTime;)Lmisk/jooq/testgen/tables/records/MovieRecord;
284-
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;
285-
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;
286-
public fun valuesRow ()Lorg/jooq/Row6;
287-
public synthetic fun valuesRow ()Lorg/jooq/Row;
288-
public synthetic fun with (Lorg/jooq/Field;Ljava/lang/Object;)Lorg/jooq/Record6;
289-
public synthetic fun with (Lorg/jooq/Field;Ljava/lang/Object;Lorg/jooq/Converter;)Lorg/jooq/Record6;
254+
public fun setCreatedAt (Ljava/time/LocalDateTime;)V
255+
public fun setGenre (Ljava/lang/String;)V
256+
public fun setId (Ljava/lang/Long;)V
257+
public fun setName (Ljava/lang/String;)V
258+
public fun setUpdatedAt (Ljava/time/LocalDateTime;)V
259+
public fun setVersion (Ljava/lang/Integer;)V
290260
}
291261

292262
public final class misk/jooq/testgen/tables/references/TablesKt {

‎misk-jooq/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ flyway {
4848
}
4949
// Needed to generate jooq test db classes
5050
jooq {
51-
version.set("3.18.2")
5251
edition.set(nu.studer.gradle.jooq.JooqEdition.OSS)
5352

5453
configurations {

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
package misk.jooq.testgen
55

66

7+
import org.jooq.Constants
78
import kotlin.collections.List
89

910
import org.jooq.Schema
1011
import org.jooq.impl.CatalogImpl
1112

12-
1313
/**
1414
* This class is generated by jOOQ.
1515
*/
@@ -20,15 +20,23 @@ open class DefaultCatalog : CatalogImpl("") {
2020
/**
2121
* The reference instance of <code>DEFAULT_CATALOG</code>
2222
*/
23-
val DEFAULT_CATALOG = DefaultCatalog()
23+
public val DEFAULT_CATALOG: DefaultCatalog = DefaultCatalog()
2424
}
2525

2626
/**
2727
* The schema <code>jooq</code>.
2828
*/
29-
val JOOQ get() = Jooq.JOOQ
29+
val JOOQ: Jooq get(): Jooq = Jooq.JOOQ
3030

3131
override fun getSchemas(): List<Schema> = listOf(
32-
Jooq.JOOQ
32+
Jooq.JOOQ
3333
)
34+
35+
/**
36+
* A reference to the 3.19 minor release of the code generator. If this
37+
* doesn't compile, it's because the runtime library uses an older minor
38+
* release, namely: 3.19. You can turn off the generation of this reference
39+
* by specifying /configuration/generator/generate/jooqVersionReference
40+
*/
41+
private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_19
3442
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ import org.jooq.impl.SchemaImpl
1818
*/
1919
@Suppress("UNCHECKED_CAST")
2020
open class Jooq : SchemaImpl("jooq", DefaultCatalog.DEFAULT_CATALOG) {
21-
companion object {
21+
public companion object {
2222

2323
/**
2424
* The reference instance of <code>jooq</code>
2525
*/
26-
val JOOQ = Jooq()
26+
val JOOQ: Jooq = Jooq()
2727
}
2828

2929
/**
3030
* The table <code>jooq.movie</code>.
3131
*/
32-
val MOVIE get() = Movie.MOVIE
32+
val MOVIE: Movie get() = Movie.MOVIE
3333

3434
override fun getCatalog(): Catalog = DefaultCatalog.DEFAULT_CATALOG
3535

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ import org.jooq.impl.Internal
1717
// UNIQUE and PRIMARY KEY definitions
1818
// -------------------------------------------------------------------------
1919

20-
val KEY_MOVIE_PRIMARY: UniqueKey<MovieRecord> = Internal.createUniqueKey(Movie.MOVIE, DSL.name("KEY_movie_PRIMARY"), arrayOf(Movie.MOVIE.ID), true)
20+
val KEY_MOVIE_PRIMARY: UniqueKey<MovieRecord> = Internal.createUniqueKey(
21+
Movie.MOVIE, DSL.name("KEY_movie_PRIMARY"), arrayOf(
22+
Movie.MOVIE.ID), true)

0 commit comments

Comments
 (0)