Skip to content

Fix how driver properties are handled #1959

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

Closed
mmimica wants to merge 8 commits into from
Closed

Fix how driver properties are handled #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e76aba
Merge pull request #1471 from microsoft/dev
ulvii Dec 3, 2020
66ee808
Merge dev to master for 9.2.0 release (#1506)
peterbae Jan 29, 2021
2de5557
done
Nov 8, 2022
5788959
Merge remote-tracking branch 'origin/main'
Nov 8, 2022
0f2c76b
Merge remote-tracking branch 'origin/master' into fix_1958
Nov 8, 2022
acf2ac4
Merge branch 'master' into fix_1958
Nov 8, 2022
f4a0483
revert
Nov 8, 2022
560df5d
revert
Nov 8, 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
4 changes: 1 addition & 3 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ public SQLServerDriver() {
static Properties fixupProperties(Properties props) throws SQLServerException {
// assert props !=null
Properties fixedup = new Properties();
Enumeration<?> e = props.keys();
Enumeration<?> e = props.propertyNames();
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
String newname = getNormalizedPropertyName(name, drLogger);
Expand Down Expand Up @@ -962,8 +962,6 @@ static Properties mergeURLAndSuppliedProperties(Properties urlProps,
Properties suppliedProperties) throws SQLServerException {
if (null == suppliedProperties)
return urlProps;
if (suppliedProperties.isEmpty())
return urlProps;
Properties suppliedPropertiesFixed = fixupProperties(suppliedProperties);
// Merge URL properties and supplied properties.
for (SQLServerDriverPropertyInfo DRIVER_PROPERTY : DRIVER_PROPERTIES) {
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@

import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;

import com.microsoft.sqlserver.jdbc.SQLServerConnection;
import com.microsoft.sqlserver.jdbc.TestUtils;
import com.microsoft.sqlserver.testframework.PrepUtil;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith;

import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

Expand Down Expand Up @@ -69,4 +74,12 @@ public void testInvalidConnectWithIPAddressPreference() throws SQLException {
}
}

@Test
public void testDefaultProperties() throws SQLException {
Properties defaults = new Properties();
defaults.setProperty("iPAddressPreference", "IPv6First");
try (SQLServerConnection con = PrepUtil.getConnection(connectionString, new Properties(defaults))) {
assertEquals("IPv6First", con.getIPAddressPreference());
}
}
}