gireesh/cdk-dbricks

airbytehq · May 10, 2024 · ffd9ee6 · ffd9ee6
1 parent 3525225
commit ffd9ee6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/airbyte-cdk/java/airbyte-cdk/README.md b/airbyte-cdk/java/airbyte-cdk/README.md
@@ -173,7 +173,8 @@ corresponds to that version.
 ### Java CDK
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                                        |
-|:--------|:-----------| :--------------------------------------------------------- |:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.34.3  | 2024-05-10 | [\#38095](https://github.com/airbytehq/airbyte/pull/38095) | Minor changes for databricks connector                                                                                                                         |
 | 0.34.1  | 2024-05-07 | [\#38030](https://github.com/airbytehq/airbyte/pull/38030) | Add support for transient errors                                                                                                                               |
 | 0.34.0  | 2024-05-01 | [\#37712](https://github.com/airbytehq/airbyte/pull/37712) | Destinations: Remove incremental T+D                                                                                                                           |
 | 0.33.2  | 2024-05-03 | [\#37824](https://github.com/airbytehq/airbyte/pull/37824) | improve source acceptance tests                                                                                                                                |

diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
@@ -1 +1 @@
-version=0.34.2
+version=0.34.3
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle b/airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     api 'com.fasterxml.jackson.core:jackson-databind'
     api 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+    api 'com.fasterxml.jackson.module:jackson-module-kotlin'
     api 'com.google.guava:guava:33.0.0-jre'
     api 'commons-io:commons-io:2.15.1'
     api ('io.airbyte.airbyte-protocol:protocol-models:0.9.0') { exclude group: 'com.google.api-client', module: 'google-api-client' }

diff --git a/.../airbyte/integrations/base/destination/typing_deduping/BaseSqlGeneratorIntegrationTest.kt b/.../airbyte/integrations/base/destination/typing_deduping/BaseSqlGeneratorIntegrationTest.kt
@@ -1544,7 +1544,7 @@ abstract class BaseSqlGeneratorIntegrationTest<DestinationState : MinimumDestina
 
     @Test
     @Throws(Exception::class)
-    fun testV1V2migration() {
+    open fun testV1V2migration() {
         // This is maybe a little hacky, but it avoids having to refactor this entire class and
         // subclasses
         // for something that is going away

diff --git a/...tFixtures/kotlin/io/airbyte/integrations/base/destination/typing_deduping/RecordDiffer.kt b/...tFixtures/kotlin/io/airbyte/integrations/base/destination/typing_deduping/RecordDiffer.kt
@@ -10,6 +10,7 @@ import com.google.common.collect.Streams
 import io.airbyte.commons.json.Jsons
 import java.math.BigDecimal
 import java.time.*
+import java.time.format.DateTimeParseException
 import java.util.*
 import java.util.function.Function
 import java.util.stream.Collectors
@@ -440,7 +441,16 @@ constructor(
                 Instant.ofEpochMilli(Long.MIN_VALUE)
             } else {
                 try {
-                    Instant.parse(node.asText())
+                    OffsetDateTime.parse(node.asText()).toInstant()
+                } catch (parseE: DateTimeParseException) {
+                    // Fallback to using LocalDateTime and try again
+                    // Some databases have Timestamp_TZ mapped to TIMESTAMP with no offset,
+                    // this is sketchy to assume it as always UTC
+                    try {
+                        LocalDateTime.parse(node.asText()).toInstant(ZoneOffset.UTC)
+                    } catch (e: Exception) {
+                        Instant.ofEpochMilli(Long.MIN_VALUE)
+                    }
                 } catch (e: Exception) {
                     Instant.ofEpochMilli(Long.MIN_VALUE)
                 }