Skip to content

Commit 6978217

Browse files
committed
Pass string
1 parent 4dbb749 commit 6978217

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,18 @@ public static Database createDatabase(final String username,
138138
return new Database(connectionPool, dialect);
139139
}
140140

141+
public static Database createDatabase(final String username,
142+
final String password,
143+
final String jdbcConnectionString,
144+
final String driverClassName,
145+
final SQLDialect dialect,
146+
final String connectionProperties) {
147+
final BasicDataSource connectionPool =
148+
createBasicDataSource(username, password, jdbcConnectionString, driverClassName, connectionProperties);
149+
150+
return new Database(connectionPool, dialect);
151+
}
152+
141153
public static JdbcDatabase createJdbcDatabase(final String username,
142154
final String password,
143155
final String jdbcConnectionString,
@@ -213,6 +225,22 @@ public static BasicDataSource createBasicDataSource(final String username,
213225
return connectionPool;
214226
}
215227

228+
public static BasicDataSource createBasicDataSource(final String username,
229+
final String password,
230+
final String jdbcConnectionString,
231+
final String driverClassName,
232+
final String connectionProperties) {
233+
final BasicDataSource connectionPool = new BasicDataSource();
234+
connectionPool.setDriverClassName(driverClassName);
235+
connectionPool.setUsername(username);
236+
connectionPool.setPassword(password);
237+
connectionPool.setInitialSize(0);
238+
connectionPool.setMaxTotal(5);
239+
connectionPool.setUrl(jdbcConnectionString);
240+
connectionPool.setConnectionProperties(connectionProperties);
241+
return connectionPool;
242+
}
243+
216244
public static BigQueryDatabase createBigQueryDatabase(final String projectId, final String jsonCreds) {
217245
return new BigQueryDatabase(projectId, jsonCreds);
218246
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import com.fasterxml.jackson.databind.JsonNode;
88
import com.fasterxml.jackson.databind.node.ObjectNode;
9-
import com.google.common.collect.ImmutableMap;
109
import io.airbyte.commons.io.IOs;
1110
import io.airbyte.commons.json.Jsons;
1211
import io.airbyte.commons.string.Strings;
@@ -142,8 +141,7 @@ protected Database getDatabase() {
142141
baseConfig.get("port").asText(),
143142
baseConfig.get("database").asText()),
144143
"com.amazon.redshift.jdbc.Driver", null,
145-
ImmutableMap.of("ssl", "true", "sslfactory", "com.amazon.redshift.ssl.NonValidatingFactory")
146-
);
144+
"ssl=true;sslfactory=com.amazon.redshift.ssl.NonValidatingFactory");
147145
}
148146

149147
@Override

0 commit comments

Comments
 (0)