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-snowflake: added connection string identifier #17116

Merged
merged 6 commits into from
Sep 26, 2022
Merged

🐛Source-snowflake: added connection string identifier #17116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4be1a4f
[16767] Source-snowflake: added connection string identifier
etsybaev Sep 24, 2022
4cfd481
Fixed test
etsybaev Sep 24, 2022
7d1b986
Merge branch 'master' into etsybaev/16767-source-snowflake-added-conn…
etsybaev Sep 26, 2022
7d2e762
minor refactor
etsybaev Sep 26, 2022
7832c3b
bumbed version
etsybaev Sep 26, 2022
8d5c1e3
auto-bump connector version [ci skip]
octavia-squidington-iii Sep 26, 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
8 changes: 6 additions & 2 deletions ...lake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeDataSourceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public class SnowflakeDataSourceUtils {
public static final String OAUTH_METHOD = "OAuth";
public static final String USERNAME_PASSWORD_METHOD = "username/password";
public static final String UNRECOGNIZED = "Unrecognized";
private static final String CONNECTION_STRING_IDENTIFIER_KEY = "application";
private static final String CONNECTION_STRING_IDENTIFIER_VAL = "Airbyte_Connector";

private static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeDataSourceUtils.class);
private static final int PAUSE_BETWEEN_TOKEN_REFRESH_MIN = 7; // snowflake access token's TTL is 10min and can't be modified
Expand Down Expand Up @@ -134,15 +136,17 @@ public static String buildJDBCUrl(final JsonNode config) {

// 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",
"role=%s&warehouse=%s&database=%s&schema=%s&JDBC_QUERY_RESULT_FORMAT=%s&CLIENT_SESSION_KEEP_ALIVE=%s&%s=%s",
config.get("role").asText(),
config.get("warehouse").asText(),
config.get(JdbcUtils.DATABASE_KEY).asText(),
config.get("schema").asText(),
// Needed for JDK17 - see
// https://stackoverflow.com/questions/67409650/snowflake-jdbc-driver-internal-error-fail-to-retrieve-row-count-for-first-arrow
"JSON",
true));
true,
CONNECTION_STRING_IDENTIFIER_KEY,
CONNECTION_STRING_IDENTIFIER_VAL));

// https://docs.snowflake.com/en/user-guide/jdbc-configure.html#jdbc-driver-connection-string
if (config.has(JdbcUtils.JDBC_URL_PARAMS_KEY)) {
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/io/airbyte/integrations/source/snowflake/SnowflakeDataSourceUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SnowflakeDataSourceUtilsTest {
}
""";
private final String expectedJdbcUrl =
"jdbc:snowflake://host/?role=role&warehouse=WAREHOUSE&database=DATABASE&schema=SOURCE_SCHEMA&JDBC_QUERY_RESULT_FORMAT=JSON&CLIENT_SESSION_KEEP_ALIVE=true";
"jdbc:snowflake://host/?role=role&warehouse=WAREHOUSE&database=DATABASE&schema=SOURCE_SCHEMA&JDBC_QUERY_RESULT_FORMAT=JSON&CLIENT_SESSION_KEEP_ALIVE=true&application=Airbyte_Connector";

@Test
void testBuildJDBCUrl() {
Expand Down