jprdonnelly/airbyte
1
0
Fork 0
mirror of synced 2025-12-25 02:09:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pass string

Browse Source
This commit is contained in:
Alexandre Girard
2022-02-22 15:10:09 -08:00
parent 4dbb749de1
commit 697821738c
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java
View File

@@ -138,6 +138,18 @@ public class Databases {
return new Database(connectionPool, dialect);
}
public static Database createDatabase(final String username,
final String password,
final String jdbcConnectionString,
final String driverClassName,
final SQLDialect dialect,
final String connectionProperties) {
final BasicDataSource connectionPool =
createBasicDataSource(username, password, jdbcConnectionString, driverClassName, connectionProperties);
return new Database(connectionPool, dialect);
}
public static JdbcDatabase createJdbcDatabase(final String username,
final String password,
final String jdbcConnectionString,
@@ -213,6 +225,22 @@ public class Databases {
return connectionPool;
}
public static BasicDataSource createBasicDataSource(final String username,
final String password,
final String jdbcConnectionString,
final String driverClassName,
final String connectionProperties) {
final BasicDataSource connectionPool = new BasicDataSource();
connectionPool.setDriverClassName(driverClassName);
connectionPool.setUsername(username);
connectionPool.setPassword(password);
connectionPool.setInitialSize(0);
connectionPool.setMaxTotal(5);
connectionPool.setUrl(jdbcConnectionString);
connectionPool.setConnectionProperties(connectionProperties);
return connectionPool;
}
public static BigQueryDatabase createBigQueryDatabase(final String projectId, final String jsonCreds) {
return new BigQueryDatabase(projectId, jsonCreds);
}

4
airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftCopyDestinationAcceptanceTest.java
View File

@@ -6,7 +6,6 @@ package io.airbyte.integrations.destination.redshift;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableMap;
import io.airbyte.commons.io.IOs;
import io.airbyte.commons.json.Jsons;
import io.airbyte.commons.string.Strings;
@@ -142,8 +141,7 @@ public class RedshiftCopyDestinationAcceptanceTest extends DestinationAcceptance
baseConfig.get("port").asText(),
baseConfig.get("database").asText()),
"com.amazon.redshift.jdbc.Driver", null,
ImmutableMap.of("ssl", "true", "sslfactory", "com.amazon.redshift.ssl.NonValidatingFactory")
);
"ssl=true;sslfactory=com.amazon.redshift.ssl.NonValidatingFactory");
}
@Override