Fix derby directory connection string parser #12479
Merged
+251
−72
Conversation
This file contains 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
github-actions
bot
added
the
test native
jaydeluca
commented
Oct 20, 2024
Comment on lines
+562
to
+569
| arg("jdbc:oracle:thin:@(description = (connect_timeout=90)(retry_count=20)(retry_delay=3) (transport_connect_timeout=3000) (address_list = (load_balance = on) (failover = on) (address = (protocol = tcp)(host = orcl.host1)(port = 1521)) (address = (protocol = tcp)(host = orcl.host2)(port = 1521)) (address = (protocol = tcp)(host = orcl.host3)(port = 1521)) (address = (protocol = tcp)(host = orcl.host4)(port = 1521)) ) (connect_data = (server = dedicated) (service_name = orclsn)))") | ||
| .setShortUrl("oracle:thin://orcl.host1:1521") | ||
| .setSystem("oracle") | ||
| .setSubtype("thin") | ||
| .setHost("orcl.host1") | ||
| .setPort(1521) | ||
| .setName("orclsn") | ||
| .build(), |
There was a problem hiding this comment.
this is an attempt to reproduce the example provided in the issue, but as far as I can tell it seems to work as expected
Comment on lines
+1116
to
+1122
| arg("jdbc:derby:directory:/usr/ibm/pep/was9/ibm/websphere/appserver/profiles/my_profile/databases/ejbtimers/myhostname/ejbtimerdb") | ||
| .setShortUrl("derby:directory:") | ||
| .setSystem("derby") | ||
| .setSubtype("directory") | ||
| .setUser("APP") | ||
| .setName("ejbtimerdb") | ||
| .build()); |
There was a problem hiding this comment.
this is the new test case using the example from the issue
trask
approved these changes
Oct 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Related to #12400
Updates the derby connection parser to use the value after the last
/to account for directory structures when pulling the database name out of a connection string like:/usr/ibm/pep/was9/ibm/websphere/appserver/profiles/<REDACTED>/databases/ejbtimers/<HOST_REDACTED>/ejbtimerdbUnrelated to this change, I also refactored the tests a bit to have separate test methods and argument classes for each database type because I found having all databases in the same test made it annoying when debugging. If we would prefer to keep it the way it was I can swap it back.
The issue also reported a problem with Oracle parsing, but when using the connection string provided in a test, things seem to work as expected.