fix(jooq) -- Fix api usage due to jooq downgrade in kork (#1005)

spinnaker · Jan 11, 2021 · 7e5603c · 7e5603c
1 parent 7b1dcc9
commit 7e5603c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/TestDatabase.kt b/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/TestDatabase.kt
@@ -28,18 +28,17 @@ import liquibase.database.jvm.JdbcConnection
 import liquibase.exception.DatabaseException
 import liquibase.exception.LiquibaseException
 import liquibase.resource.ClassLoaderResourceAccessor
-import org.jooq.CloseableDSLContext
 import org.jooq.DSLContext
 import org.jooq.SQLDialect
 import org.jooq.Schema
 import org.jooq.conf.RenderNameStyle.AS_IS
 import org.jooq.impl.DSL.currentSchema
 import org.jooq.impl.DataSourceConnectionProvider
 import org.jooq.impl.DefaultConfiguration
-import org.jooq.impl.DefaultCloseableDSLContext
+import org.jooq.impl.DefaultDSLContext
 import org.slf4j.LoggerFactory
 
-internal fun initDatabase(jdbcUrl: String, sqlDialect: SQLDialect): CloseableDSLContext {
+internal fun initDatabase(jdbcUrl: String, sqlDialect: SQLDialect): DSLContext {
   val dataSource = HikariDataSource(
     HikariConfig().also {
       it.jdbcUrl = jdbcUrl
@@ -73,7 +72,7 @@ internal fun initDatabase(jdbcUrl: String, sqlDialect: SQLDialect): CloseableDSL
     throw DatabaseInitializationFailed(e)
   }
 
-  return DefaultCloseableDSLContext(config.connectionProvider(), config.dialect(), config.settings())
+  return DefaultDSLContext(config)
 }
 
 internal class DatabaseInitializationFailed(cause: Throwable) : RuntimeException(cause)

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 fiatVersion=1.26.0
 includeProviders=azure,gcs,oracle,redis,s3,swift,sql
-korkVersion=7.94.2
+korkVersion=7.96.0
 org.gradle.parallel=true
 spinnakerGradleVersion=8.10.0
 targetJava11=true