Re-added support for stored procedure 'exec' escape syntax in CallableStatements #2325

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

Merged

tkyc merged 12 commits into main from sp-regression-fix

Feb 15, 2024

Contributor

tkyc commented Feb 8, 2024 •

edited

Loading

Prior to 12.6.0, all cstmts calls were wrapped int T-SQL sp_executesql, sp_prepexec etc.. calls before being sent off to the server. Doing so means the raw/unprocessed user's sql was passed into these T-SQL calls as parameter values and so the driver was able to execute "EXEC" calls against the server eg. EXEC sp_columns_100 ?,?,?,?.....

For example:

exec sp_executesql N'EXEC sp_getapplock @Resource=@P0, @LockTimeout='3600000', @LockMode='Exclusive', @LockOwner='Session',N'@P0 nvarchar(4000)',N'testParamValue'

This PR enables this prior behaviour again.

tkyc added 4 commits

February 8, 2024 13:39


          EXEC system stored procedure regression fix

6aec311


          Additional test

c128ad0


          Additional test

3f373d4


          Indenting

5067efc

tkyc requested review from Jeffery-Wasty, barryw-mssql and lilgreenbird

February 9, 2024 00:36

lilgreenbird linked an issue

that may be closed by this pull request

mssql-jdbc:12.6.0.jre11 - 'sp_getapplock' expects parameter '@LockMode' #2323

Closed

lilgreenbird added this to the 12.6.1 milestone


          Switched error string to TestResource error string

507107b

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java Outdated Show resolved Hide resolved

lilgreenbird requested a review from David-Engel

February 9, 2024 01:07

lilgreenbird reviewed

View reviewed changes

src/test/java/com/microsoft/sqlserver/jdbc/callablestatement/CallableStatementTest.java Outdated Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/test/java/com/microsoft/sqlserver/jdbc/callablestatement/CallableStatementTest.java Show resolved Hide resolved

lilgreenbird reviewed

View reviewed changes

src/test/java/com/microsoft/sqlserver/jdbc/callablestatement/CallableStatementTest.java Outdated Show resolved Hide resolved

tkyc added 3 commits

February 8, 2024 17:31


          CR comments

e9cc6d1


          Test update p1

ecbd3ac


          Test update p2

11b54b2

lilgreenbird previously approved these changes

View reviewed changes

David-Engel reviewed

View reviewed changes

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java Outdated Show resolved Hide resolved


          CR comment changes; Test update

1f977ab

tkyc dismissed lilgreenbird’s stale review via

1f977ab

February 9, 2024 22:18


          call escape syntax check

d9d90eb

lilgreenbird reviewed

View reviewed changes

Contributor

lilgreenbird left a comment

change the title to something more descriptive instead of just regression fix


          CR changes

a67dc94

tkyc changed the title ~~EXEC system stored procedure regression fix~~ Re-added support for stored procedure 'exec' escape syntax in CallableStatements

David-Engel previously approved these changes

View reviewed changes


          formatting

41a30c1

tkyc dismissed David-Engel’s stale review via

41a30c1

February 14, 2024 00:07

lilgreenbird approved these changes

View reviewed changes

Jeffery-Wasty approved these changes

View reviewed changes

tkyc merged commit ba88da8 into main

tkyc deleted the sp-regression-fix branch

February 15, 2024 22:26

tkyc added a commit that referenced this pull request


          Re-added support for stored procedure 'exec' escape syntax in Callabl…

b2947c5

…eStatements (#2325)

* EXEC system stored procedure regression fix

* Additional test

* Additional test

* Indenting

* Switched error string to TestResource error string

* CR comments

* Test update p1

* Test update p2

* CR comment changes; Test update

* call escape syntax check

* CR changes

* formatting

tkyc mentioned this pull request

Re-added support for stored procedure 'exec' escape syntax in CallableStatement port #2329

Merged

tkyc added a commit that referenced this pull request


          Re-added support for stored procedure 'exec' escape syntax in Callabl…

e2685b4

…eStatements (#2325) (#2329)

* EXEC system stored procedure regression fix

* Additional test

* Additional test

* Indenting

* Switched error string to TestResource error string

* CR comments

* Test update p1

* Test update p2

* CR comment changes; Test update

* call escape syntax check

* CR changes

* formatting

olerabanal mentioned this pull request

Flyway 10.7.1 does not seem to be compatible with mssql-jdbc:12.6.0.jre11 - 'sp_getapplock' expects parameter '@LockMode' flyway/flyway#3833

Closed

olerabanal commented Feb 21, 2024

I cannot see #2325 in the release notes of 12.6.1 ? @tkyc

Contributor Author

tkyc commented Feb 21, 2024

@olerabanal #2329 is the backport of this PR to 12.6, which is in the release notes.

Jeffery-Wasty added a commit that referenced this pull request


          Revert "Re-added support for stored procedure 'exec' escape syntax in…

b7b8fa9

… CallableStatements (#2325) (#2329)"

This reverts commit e2685b4.

tkyc added a commit that referenced this pull request


          Revert "Re-added support for stored procedure 'exec' escape syntax in…

70ac59f

… CallableStatements (#2325)"

This reverts commit ba88da8.

tkyc mentioned this pull request

Revert Execute Stored Procedure directly feature #2488

Merged

tkyc added a commit that referenced this pull request


          Revert Execute Stored Procedure directly feature (#2488)

4c6227a

* Revert "Execute Stored Procedures Directly (#2154)"

This reverts commit 11680a6.

* Revert "Execute cstmt directly - Additional testing and changes (#2284)"

This reverts commit 92cfe0d.

* Revert "Re-added support for stored procedure 'exec' escape syntax in CallableStatements (#2325)"

This reverts commit ba88da8.

* Additional revert of missed lines

* Added no-op for getters/setters

* RequestBoundaryMethods no-op test fix

tkyc added a commit that referenced this pull request


          Revert Execute Stored Procedure directly feature (#2488)

7b2d4a6

* Revert "Execute Stored Procedures Directly (#2154)"

This reverts commit 11680a6.

* Revert "Execute cstmt directly - Additional testing and changes (#2284)"

This reverts commit 92cfe0d.

* Revert "Re-added support for stored procedure 'exec' escape syntax in CallableStatements (#2325)"

This reverts commit ba88da8.

* Additional revert of missed lines

* Added no-op for getters/setters

* RequestBoundaryMethods no-op test fix

tkyc mentioned this pull request

[Backport] Revert Execute Stored Procedure directly feature (#2488) #2494

Merged

tkyc added a commit that referenced this pull request


          Revert Execute Stored Procedure directly feature (#2488) (#2494)

21d236a

* Revert "Execute Stored Procedures Directly (#2154)"

This reverts commit 11680a6.

* Revert "Execute cstmt directly - Additional testing and changes (#2284)"

This reverts commit 92cfe0d.

* Revert "Re-added support for stored procedure 'exec' escape syntax in CallableStatements (#2325)"

This reverts commit ba88da8.

* Additional revert of missed lines

* Added no-op for getters/setters

* RequestBoundaryMethods no-op test fix

tkyc added a commit that referenced this pull request


          Revert Execute Stored Procedure directly feature (#2488)

f2f3f17

* Revert "Execute Stored Procedures Directly (#2154)"

This reverts commit 11680a6.

* Revert "Execute cstmt directly - Additional testing and changes (#2284)"

This reverts commit 92cfe0d.

* Revert "Re-added support for stored procedure 'exec' escape syntax in CallableStatements (#2325)"

This reverts commit ba88da8.

* Additional revert of missed lines

* Added no-op for getters/setters

* RequestBoundaryMethods no-op test fix

tkyc mentioned this pull request

[Backport] Revert Execute Stored Procedure directly feature (#2488) #2500

Merged

tkyc added a commit that referenced this pull request


          Revert Execute Stored Procedure directly feature (#2488) (#2500)

07f02b3

* Revert "Execute Stored Procedures Directly (#2154)"

This reverts commit 11680a6.

* Revert "Execute cstmt directly - Additional testing and changes (#2284)"

This reverts commit 92cfe0d.

* Revert "Re-added support for stored procedure 'exec' escape syntax in CallableStatements (#2325)"

This reverts commit ba88da8.

* Additional revert of missed lines

* Added no-op for getters/setters

* RequestBoundaryMethods no-op test fix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

David-Engel David-Engel left review comments

barryw-mssql Awaiting requested review from barryw-mssql

+2 more reviewers

lilgreenbird lilgreenbird approved these changes

Jeffery-Wasty Jeffery-Wasty approved these changes

Labels

None yet