From 377776080684920d492a8f163428beb3177410a4 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 +- .../destination-postgres/build.gradle | 2 +- .../typing_deduping/PostgresSqlGenerator.java | 30 ++----------------- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle index 87d5e2b99a775..6337e398a79ac 100644 --- a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle +++ b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/build.gradle @@ -5,7 +5,7 @@ plugins { airbyteJavaConnector { cdkVersionRequired = '0.20.4' features = ['db-destinations', 'typing-deduping', 'datastore-postgres'] - useLocalCdk = false + useLocalCdk = true } application { diff --git a/airbyte-integrations/connectors/destination-postgres/build.gradle b/airbyte-integrations/connectors/destination-postgres/build.gradle index 54398f71bd38f..a1f833df547f3 100644 --- a/airbyte-integrations/connectors/destination-postgres/build.gradle +++ b/airbyte-integrations/connectors/destination-postgres/build.gradle @@ -5,7 +5,7 @@ plugins { airbyteJavaConnector { cdkVersionRequired = '0.20.4' features = ['db-destinations', 'datastore-postgres', 'typing-deduping'] - useLocalCdk = false + useLocalCdk = true } application { 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 0918226b3227a..2a83356752913 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 @@ -9,7 +9,6 @@ import static io.airbyte.cdk.integrations.base.JavaBaseConstants.COLUMN_NAME_AB_META; import static io.airbyte.cdk.integrations.base.JavaBaseConstants.COLUMN_NAME_AB_RAW_ID; import static io.airbyte.cdk.integrations.base.JavaBaseConstants.COLUMN_NAME_DATA; -import static java.util.Collections.emptyList; import static org.jooq.impl.DSL.array; import static org.jooq.impl.DSL.case_; import static org.jooq.impl.DSL.cast; @@ -150,21 +149,6 @@ public Sql createTable(final StreamConfig stream, final String suffix, final boo return Sql.concat(statements); } - @Override - protected List createIndexSql(final StreamConfig stream, final String suffix) { - if (stream.destinationSyncMode() == DestinationSyncMode.APPEND_DEDUP && !stream.primaryKey().isEmpty()) { - return List.of( - getDslContext().createIndex().on( - name(stream.id().finalNamespace(), stream.id().finalName() + suffix), - stream.primaryKey().stream() - .map(pk -> quotedName(pk.name())) - .toList()) - .getSQL()); - } else { - return emptyList(); - } - } - @Override protected List> extractRawDataFields(final LinkedHashMap columns, final boolean useExpensiveSaferCasting) { return columns @@ -173,20 +157,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,