Skip to content

Account for defaults when normalizing properties #2852

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

Open
elijahaj wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −1
Open

Account for defaults when normalizing properties #2852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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 @@ -1212,7 +1212,7 @@ public static synchronized void unregisterPerformanceLogCallback() {
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
31 changes: 31 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/SQLServerDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,37 @@ public void testConnectionDriver() throws SQLException {
}
}
}

/**
* test connection properties
*
* @throws SQLException
*/
@Test
public void testDefaultProperties() throws SQLException {
SQLServerDriver d = new SQLServerDriver();
Properties defaults = new Properties();
defaults.setProperty(SQLServerDriverIntProperty.PORT_NUMBER.toString(), "101");
defaults.setProperty(SQLServerDriverStringProperty.DATABASE_NAME.toString(), "test");

Properties info = new Properties(defaults);
StringBuffer url = new StringBuffer();
url.append(Constants.JDBC_PREFIX).append(randomServer).append(";packetSize=512;");

// test defaults
DriverPropertyInfo[] infoArray = d.getPropertyInfo(url.toString(), info);

for (DriverPropertyInfo anInfoArray : infoArray) {
if (anInfoArray.name.equalsIgnoreCase(Constants.PORT_NUMBER)) {
assertTrue(anInfoArray.value.equalsIgnoreCase("101"),
TestResource.getResource("R_valuesAreDifferent"));
}
if (anInfoArray.name.equalsIgnoreCase(Constants.DATABASE_NAME)) {
assertTrue(anInfoArray.value.equalsIgnoreCase("test"),
TestResource.getResource("R_valuesAreDifferent"));
}
}
}

/**
* test application name
Expand Down