Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎉 Source and Destination Snowflake: Add jdbc_url_params support for optional JDBC parameters #9623

Merged
merged 19 commits into from
Jan 28, 2022
Merged

🎉 Source and Destination Snowflake: Add jdbc_url_params support for optional JDBC parameters #9623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
779a2f8
Add support for jdbc_url_params optional JDBC parameters for Source S…
noahkawasakigoogle Jan 20, 2022
c82b9da
Update docs and fix param separator in SnowflakeSource
noahkawasakigoogle Jan 20, 2022
a42aec6
Small markdown fixes
noahkawasakigoogle Jan 20, 2022
e0e800b
Fix Java syntax
noahkawasakigoogle Jan 20, 2022
0ffb382
Changelog conflict
noahkawasakigoogle Jan 20, 2022
b01a038
Fix one ;
noahkawasakigoogle Jan 20, 2022
80af2f7
Add logger for JDBC string
noahkawasakigoogle Jan 20, 2022
7b1ddf7
add MIT license under docs/integrations
noahkawasakigoogle Jan 20, 2022
cdfc867
Bump changelog patch version
noahkawasakigoogle Jan 20, 2022
febf904
Bump all versions, remove LICENSE
noahkawasakigoogle Jan 21, 2022
4fd062a
merge conflicts and update snowflake destionation to 0.4.5
noahkawasakigoogle Jan 25, 2022
df0b3f8
JDBC URL string
noahkawasakigoogle Jan 27, 2022
0059f91
merge master and fix conflicts
alafanechere Jan 28, 2022
607e54f
fix typo
alafanechere Jan 28, 2022
be732ff
update dest spec
alafanechere Jan 28, 2022
d40931a
fix typo
alafanechere Jan 28, 2022
4fb3ea8
fix wrong change
alafanechere Jan 28, 2022
2b44ce0
update source_specs.yaml
alafanechere Jan 28, 2022
52fb540
update destinations_specs.yaml
alafanechere Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Java syntax
  • Loading branch information
@noahkawasakigoogle
noahkawasakigoogle committed Jan 20, 2022
commit e0e800bec581aa62d068ff19d51703e778abf217
8 changes: 5 additions & 3 deletions ...wflake/src/main/java/io/airbyte/integrations/destination/snowflake/SnowflakeDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ public class SnowflakeDatabase {
private static final SnowflakeSQLNameTransformer nameTransformer = new SnowflakeSQLNameTransformer();

public static Connection getConnection(final JsonNode config) throws SQLException {
final String connectUrl = String.format("jdbc:snowflake://%s/?", config.get("host").asText());

final StringBuilder jdbcUrl = new StringBuilder(String.format("jdbc:snowflake://%s/?",
config.get("host").asText()));

final Properties properties = new Properties();

Expand All @@ -49,10 +51,10 @@ public static Connection getConnection(final JsonNode config) throws SQLExceptio

// https://docs.snowflake.com/en/user-guide/jdbc-configure.html#jdbc-driver-connection-string
if (config.has("jdbc_url_params")) {
connectUrl.append(config.get("jdbc_url_params").asText());
jdbcUrl.append(config.get("jdbc_url_params").asText());
}

return DriverManager.getConnection(connectUrl, properties);
return DriverManager.getConnection(jdbcUrl.toString(), properties);
}

public static JdbcDatabase getDatabase(final JsonNode config) {
Expand Down
4 changes: 2 additions & 2 deletions ...rce-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static void main(final String[] args) throws Exception {
public JsonNode toDatabaseConfig(final JsonNode config) {

final StringBuilder jdbcUrl = new StringBuilder(String.format("jdbc:snowflake://%s/?",
config.get("host").asText());
config.get("host").asText()));

// Add required properties
jdbcUrl.append(String.format("role=%s&warehouse=%s&database=%s&schema=%s&JDBC_QUERY_RESULT_FORMAT=%s&CLIENT_SESSION_KEEP_ALIVE=%s;",
Expand All @@ -57,7 +57,7 @@ public JsonNode toDatabaseConfig(final JsonNode config) {

final ImmutableMap.Builder<Object, Object> configBuilder = ImmutableMap.builder()
.put("username", config.get("username").asText())
.put("password", config.get("password").asText()
.put("password", config.get("password").asText())
.put("jdbc_url", jdbcUrl.toString());

return Jsons.jsonNode(configBuilder.build());
Expand Down