From 3cc59a20d0b2ba411c766a4b4a2a37312c59a1c7 Mon Sep 17 00:00:00 2001 From: evantahler Date: Tue, 16 Aug 2022 09:32:52 -0700 Subject: [PATCH 1/2] Postgres file reader assumes UTF8 --- .../airbyte/integrations/util/PostgresSslConnectionUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/util/PostgresSslConnectionUtils.java b/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/util/PostgresSslConnectionUtils.java index 3339232706cd7..1ba1bd7cca081 100644 --- a/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/util/PostgresSslConnectionUtils.java +++ b/airbyte-integrations/bases/base-java/src/main/java/io/airbyte/integrations/util/PostgresSslConnectionUtils.java @@ -85,7 +85,7 @@ private static String checkOrCreatePassword(final JsonNode encryption) { private static String readFile(final File file) { try { - BufferedReader reader = new BufferedReader(new FileReader(file)); + BufferedReader reader = new BufferedReader(new FileReader(file, StandardCharsets.UTF_8)); String currentLine = reader.readLine(); reader.close(); return currentLine; From b828daf496dea51dfbafddcaa34f4a6185aee81a Mon Sep 17 00:00:00 2001 From: Edward Gao Date: Tue, 16 Aug 2022 16:00:07 -0700 Subject: [PATCH 2/2] fix build :/ --- .../io/airbyte/integrations/source/postgres/PostgresSource.java | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java index 6e0f2dbd157f5..5cbe4600bf8a8 100644 --- a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java +++ b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Sets; import io.airbyte.commons.features.EnvVariableFeatureFlags; import io.airbyte.commons.features.FeatureFlags;