-
Notifications
You must be signed in to change notification settings - Fork 4.6k
🎉 Destination MySQL: Add jdbc_url_params support for optional JDBC parameters #10362
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.
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
Merged
Merged
Changes from 26 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
4d751f4
pass through jdbc params
girarda 9b6c5bd
fail if contains verifyServerCertificate
girarda c924611
do the same for all ssl params
girarda c959dd8
delete dead file
girarda 4b7d8fe
slight refactor
girarda e401db1
new method
girarda 76d8595
remove default value
girarda 4e592ed
error message
girarda c90021b
rename
girarda 59415f8
Merge branch 'master' into alex/mysql-jdbc-params
girarda 51b13aa
update as per comments
girarda 95e1a83
Update exception message
girarda 607f101
Bump version
girarda c550028
extract to method
girarda 097906f
Update doc
girarda 0e9e8ea
Revert "Update doc"
girarda 9744ba4
Update doc
girarda 70cd82d
delete dead code
girarda 1c7660e
update doc
girarda 6bfce23
Throw exception with better error message
girarda e600978
Add missing test
girarda 4f9b1de
Use MoreMaps::merge
girarda 510c954
Add missing tests
girarda c53e6c8
camel case
girarda c1eccd4
Allow colliding parameters if values are equal
girarda e9e2d7a
Remove trailing &
girarda 80352b6
Throw IllegalArgumentException
girarda d3a1263
extract to constants
girarda 449e2cf
Bump version in seed
girarda 5800b6d
Update destination specs
girarda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
...n-mysql/src/test/java/io/airbyte/integrations/destination/mysql/MySQLDestinationTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| package io.airbyte.integrations.destination.mysql; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
| import static org.mockito.Mockito.spy; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import io.airbyte.commons.json.Jsons; | ||
| import io.airbyte.commons.map.MoreMaps; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class MySQLDestinationTest { | ||
tuliren marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| private MySQLDestination getDestination() { | ||
| final MySQLDestination result = spy(MySQLDestination.class); | ||
| return result; | ||
| } | ||
|
|
||
| private JsonNode buildConfigNoJdbcParameters() { | ||
| final JsonNode config = Jsons.jsonNode(ImmutableMap.of( | ||
| "host", "localhost", | ||
| "port", 1337, | ||
| "username", "user", | ||
| "database", "db" | ||
| )); | ||
| return config; | ||
| } | ||
|
|
||
| private JsonNode buildConfigWithExtraJdbcParameters(final String extraParam) { | ||
| final JsonNode config = Jsons.jsonNode(ImmutableMap.of( | ||
| "host", "localhost", | ||
| "port", 1337, | ||
| "username", "user", | ||
| "database", "db", | ||
| "jdbc_url_params", extraParam | ||
| )); | ||
| return config; | ||
| } | ||
|
|
||
| private JsonNode buildConfigWithExtraJdbcParametersWithNoSsl(final String extraParam) { | ||
| final JsonNode config = Jsons.jsonNode(ImmutableMap.of( | ||
| "host", "localhost", | ||
| "port", 1337, | ||
| "username", "user", | ||
| "database", "db", | ||
| "ssl", false, | ||
| "jdbc_url_params", extraParam | ||
| )); | ||
| return config; | ||
| } | ||
|
|
||
| private JsonNode buildConfigNoExtraJdbcParametersWithoutSsl() { | ||
| final JsonNode config = Jsons.jsonNode(ImmutableMap.of( | ||
| "host", "localhost", | ||
| "port", 1337, | ||
| "username", "user", | ||
| "database", "db", | ||
| "ssl", false | ||
| )); | ||
| return config; | ||
| } | ||
|
|
||
| @Test | ||
| void testNoExtraParams() { | ||
| final JsonNode jdbcConfig = getDestination().toJdbcConfig(buildConfigNoJdbcParameters()); | ||
| final String url = jdbcConfig.get("jdbc_url").asText(); | ||
| assertEquals("jdbc:mysql://localhost:1337/db?verifyServerCertificate=false&zeroDateTimeBehavior=convertToNull&requireSSL=true&useSSL=true", url); | ||
| } | ||
|
|
||
| @Test | ||
| void testEmptyExtraParams() { | ||
| final JsonNode jdbcConfig = getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters("")); | ||
| final String url = jdbcConfig.get("jdbc_url").asText(); | ||
| assertEquals("jdbc:mysql://localhost:1337/db?verifyServerCertificate=false&zeroDateTimeBehavior=convertToNull&requireSSL=true&useSSL=true", url); | ||
| } | ||
|
|
||
| @Test | ||
| void testExtraParams() { | ||
| final String extraParam = "key1=value1&key2=value2&key3=value3"; | ||
| final JsonNode jdbcConfig = getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(extraParam)); | ||
| final String url = jdbcConfig.get("jdbc_url").asText(); | ||
| assertEquals( | ||
| "jdbc:mysql://localhost:1337/db?key1=value1&key2=value2&key3=value3&verifyServerCertificate=false&zeroDateTimeBehavior=convertToNull&requireSSL=true&useSSL=true", | ||
| url); | ||
| } | ||
|
|
||
| @Test | ||
| void testExtraParamsWithDefaultParameter() { | ||
| final Map<String, String> allDefaultParameters = MoreMaps.merge(MySQLDestination.SSL_JDBC_PARAMETERS, | ||
| MySQLDestination.DEFAULT_JDBC_PARAMETERS); | ||
| for (final Entry<String, String> entry : allDefaultParameters.entrySet()) { | ||
| final String identicalParameter = MySQLDestination.formatParameter(entry.getKey(), entry.getValue()); | ||
| final String overridingParameter = MySQLDestination.formatParameter(entry.getKey(), "DIFFERENT_VALUE"); | ||
|
|
||
| // Do not throw an exception if the values are equal | ||
| assertDoesNotThrow(() -> | ||
| getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(identicalParameter)).get("jdbc_url").asText() | ||
| ); | ||
| // Throw an exception if the values are different | ||
| assertThrows(RuntimeException.class, () -> | ||
| getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(overridingParameter)) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void testExtraParameterNoSsl() { | ||
| final String extraParam = "key1=value1&key2=value2&key3=value3"; | ||
| final JsonNode jdbcConfig = getDestination().toJdbcConfig(buildConfigWithExtraJdbcParametersWithNoSsl(extraParam)); | ||
| final String url = jdbcConfig.get("jdbc_url").asText(); | ||
| assertEquals( | ||
| "jdbc:mysql://localhost:1337/db?key1=value1&key2=value2&key3=value3&zeroDateTimeBehavior=convertToNull", | ||
| url); | ||
| } | ||
|
|
||
| @Test | ||
| void testNoExtraParameterNoSsl() { | ||
| final JsonNode jdbcConfig = getDestination().toJdbcConfig(buildConfigNoExtraJdbcParametersWithoutSsl()); | ||
| final String url = jdbcConfig.get("jdbc_url").asText(); | ||
| assertEquals( | ||
| "jdbc:mysql://localhost:1337/db?zeroDateTimeBehavior=convertToNull", | ||
| url); | ||
| } | ||
|
|
||
| @Test | ||
| void testInvalidExtraParam() { | ||
| final String extraParam = "key1=value1&sdf&"; | ||
| assertThrows(RuntimeException.class, () -> { | ||
| getDestination().toJdbcConfig(buildConfigWithExtraJdbcParameters(extraParam)); | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
append "?" instead of "&" since this
zeroDateTimeBehavior=convertToNullis already included inadditionalParameters