bulk-cdk-toolkits-extract-jdbc: noop JdbcCheckQueries when no queries…

… defined (#44842)
airbytehq · Sep 3, 2024 · be6b5ef · be6b5ef
1 parent f85baeb
commit be6b5ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/...e-cdk/bulk/toolkits/extract-jdbc/src/main/kotlin/io/airbyte/cdk/check/JdbcCheckQueries.kt b/...e-cdk/bulk/toolkits/extract-jdbc/src/main/kotlin/io/airbyte/cdk/check/JdbcCheckQueries.kt
@@ -30,7 +30,7 @@ const val CHECK_QUERIES_PREFIX = "airbyte.connector.check.jdbc"
 class JdbcCheckQueries {
 
     // Micronaut configuration objects work better with mutable properties.
-    lateinit var queries: List<String>
+    protected var queries: List<String> = emptyList()
 
     private val log = KotlinLogging.logger {}
 

diff --git a/...k/bulk/toolkits/extract-jdbc/src/test/kotlin/io/airbyte/cdk/check/JdbcCheckQueriesTest.kt b/...k/bulk/toolkits/extract-jdbc/src/test/kotlin/io/airbyte/cdk/check/JdbcCheckQueriesTest.kt
@@ -21,6 +21,12 @@ class JdbcCheckQueriesTest {
 
     @Inject lateinit var checkQueries: JdbcCheckQueries
 
+    @Test
+    fun testEmpty() {
+        val empty = JdbcCheckQueries()
+        Assertions.assertDoesNotThrow { h2.createConnection().use { empty.executeAll(it) } }
+    }
+
     @Test
     @Property(name = "$Q[0]", value = "SELECT DATABASE_PATH() FROM DUAL")
     fun testPass() {

diff --git a/.../toolkits/extract-jdbc/src/test/kotlin/io/airbyte/cdk/discover/JdbcMetadataQuerierTest.kt b/.../toolkits/extract-jdbc/src/test/kotlin/io/airbyte/cdk/discover/JdbcMetadataQuerierTest.kt
@@ -23,7 +23,7 @@ class JdbcMetadataQuerierTest {
         JdbcMetadataQuerier.Factory(
             selectQueryGenerator = H2SourceOperations(),
             fieldTypeMapper = H2SourceOperations(),
-            checkQueries = JdbcCheckQueries().apply { queries = listOf() },
+            checkQueries = JdbcCheckQueries(),
             constants = DefaultJdbcConstants(),
         )