Fix: forward Hikari data-source-properties to JDBC driver#11947
Open
itsmehotpants wants to merge 1 commit into
Open
Fix: forward Hikari data-source-properties to JDBC driver#11947itsmehotpants wants to merge 1 commit into
itsmehotpants wants to merge 1 commit into
Conversation
createConnection() used 'new Properties(info)', which chains info as *default* properties rather than copying its entries. Properties#getProperty() consults defaults, but raw Hashtable-style access (get, entrySet, keySet) - which many JDBC drivers use internally to enumerate connection args - does not. As a result, properties supplied via Hikari's data-source-properties (e.g. rewriteBatchedStatements, profileSQL) were silently dropped. Switched to 'new Properties()' + 'putAll(info)' so info's entries become real entries in the merged Properties object. Fixes testcontainers#1537
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #1537.
createConnection()usednew Properties(info), which chainsinfoas default properties rather than copying its entries.Properties#getProperty()consults defaults, but rawHashtable-style access (get,entrySet,keySet) - which many JDBC drivers use internally to enumerate connection args - does not. As a result, properties supplied via Hikari'sdata-source-properties(e.g.rewriteBatchedStatements,profileSQL) were silently dropped, with the only workaround being to stuff them into the JDBC URL query string instead.Fix: switched to
new Properties()+properties.putAll(info)soinfo's entries become real entries in the mergedPropertiesobject rather than just a defaults fallback.Added a unit test (
JdbcDatabaseContainerTest) with a fake capturingDriverthat asserts the properties are visible via rawHashtableaccess, not justgetProperty()- which is what would have masked this bug in the first place.