Skip to content
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

Jump to bottom

Fixed parentheses parsing for stored procedures and functions names #2467

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Fixed parentheses parsing for stored procedures and functions names #2467

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/SQLServerPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void setPreparedStatementHandle(int handle) {
* Regex for JDBC 'call' escape syntax
*/
private static final Pattern callEscapePattern = Pattern
.compile("^\\s*(?i)\\{(\\s*\\??\\s*=?\\s*)call [^\\(\\)]+\\s*(\\(\\s*\\?\\s*(,\\s*\\?\\s*)*\\))?\\s*}");
.compile("^\\s*(?i)\\{(\\s*\\??\\s*=?\\s*)call [^\\(\\)]+\\s*((\\(\\s*\\?\\s*(,\\s*\\?\\s*)*\\))?|\\(\\))\\s*}");

/**
* Regex for 'exec' escape syntax
Expand Down
11 changes: 11 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/callablestatement/CallableStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,17 @@ public void testZeroParamSproc() throws SQLException {
cs.execute();
assertEquals(1, cs.getInt(1));
}

// Test zero parameter sproc with return value with parentheses
call = "{? = CALL " + zeroParamSproc + "()}";

try (CallableStatement cs = connection.prepareCall(call)) {
cs.registerOutParameter(1, Types.INTEGER);
cs.execute();
// Calling zero parameter sproc with return value with parentheses
// should return a value that's not zero
assertEquals(1, cs.getInt(1));
}
}

@Test
Expand Down
Loading