From a0cae7614c14c51e99e293acc39684e74cedeb61 Mon Sep 17 00:00:00 2001 From: Edward Gao Date: Mon, 29 Jan 2024 08:49:48 -0800 Subject: [PATCH] postgres updates to latest cdk --- .../build.gradle | 2 +- .../connectors/destination-postgres/build.gradle | 2 +- .../typing_deduping/PostgresSqlGenerator.java | 14 +++----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle index 8a0ce598b05fa..d4cd1553e736a 100644 --- a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle @@ -9,7 +9,7 @@ airbyteJavaConnector { 'db-sources', // required for tests 'db-destinations' ] - useLocalCdk = false + useLocalCdk = true } //remove once upgrading the CDK version to 0.4.x or later diff --git a/airbyte-integrations/connectors/destination-postgres/build.gradle b/airbyte-integrations/connectors/destination-postgres/build.gradle index 0bc39653b8f08..5b0f5ffe0ea60 100644 --- a/airbyte-integrations/connectors/destination-postgres/build.gradle +++ b/airbyte-integrations/connectors/destination-postgres/build.gradle @@ -9,7 +9,7 @@ airbyteJavaConnector { 'db-sources', // required for tests 'db-destinations', ] - useLocalCdk = false + useLocalCdk = true } //remove once upgrading the CDK version to 0.4.x or later diff --git a/airbyte-integrations/connectors/destination-postgres/src/main/java/io/airbyte/integrations/destination/postgres/typing_deduping/PostgresSqlGenerator.java b/airbyte-integrations/connectors/destination-postgres/src/main/java/io/airbyte/integrations/destination/postgres/typing_deduping/PostgresSqlGenerator.java index 342ab040fc795..efec858d57a65 100644 --- a/airbyte-integrations/connectors/destination-postgres/src/main/java/io/airbyte/integrations/destination/postgres/typing_deduping/PostgresSqlGenerator.java +++ b/airbyte-integrations/connectors/destination-postgres/src/main/java/io/airbyte/integrations/destination/postgres/typing_deduping/PostgresSqlGenerator.java @@ -142,20 +142,12 @@ protected List> extractRawDataFields(final LinkedHashMap castedField( extractColumnAsJson(column.getKey()), column.getValue(), - column.getKey().name(), - useExpensiveSaferCasting)) - .collect(Collectors.toList()); + useExpensiveSaferCasting + ).as(quotedName(column.getKey().name())) + ).collect(Collectors.toList()); } @Override - protected Field castedField( - final Field field, - final AirbyteType type, - final String alias, - final boolean useExpensiveSaferCasting) { - return castedField(field, type, useExpensiveSaferCasting).as(quotedName(alias)); - } - protected Field castedField( final Field field, final AirbyteType type,