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.

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

Ensure that batchParamValues is cleared in all cases when executing a batch #1869

Merged
merged 4 commits into from
Aug 30, 2022

Conversation

ianroberts
Copy link
Contributor

This is an alternative implementation to #1768 which moves the batchParamValues = null to a new top-level try/finally block.

Closes #1767

@ianroberts
Copy link
Contributor Author

It looks like a lot of changes but it's mostly whitespace as I've had to indent the whole method bodies by an extra 4 spaces to wrap them in a try block.

@Jeffery-Wasty
Copy link
Member

Hi @ianroberts,

Just a comment. We haven't forgotten about this, but for the time being priority is being given to preparing for our upcoming release. Expect to see this addressed shortly thereafter.

@Jeffery-Wasty Jeffery-Wasty self-assigned this Aug 11, 2022
@Jeffery-Wasty Jeffery-Wasty added the Under Review Used for pull requests under review label Aug 11, 2022
@lilgreenbird lilgreenbird added this to Under Peer Review in MSSQL JDBC Aug 15, 2022
…atch, whether via bulk update or via traditional batch insert.

Closes microsoft#1767

Signed-off-by: Ian Roberts <i.roberts@dcs.shef.ac.uk>
Signed-off-by: Ian Roberts <i.roberts@dcs.shef.ac.uk>
@Jeffery-Wasty
Copy link
Member

I've cleaned up the tests slightly, but otherwise this perfectly reproduces, resolves, and confirms resolution of, the issue. Thank you so much!

Jeffery-Wasty
Jeffery-Wasty previously approved these changes Aug 17, 2022
@Jeffery-Wasty Jeffery-Wasty self-requested a review August 17, 2022 19:30
@Jeffery-Wasty
Copy link
Member

Almost ready, can we ask that you run the files through your ide, formatting using the format files included at the root. We think there may be some minor spacing issues.

MSSQL JDBC automation moved this from Under Peer Review to In progress Aug 18, 2022
@ianroberts
Copy link
Contributor Author

I don't have Eclipse (I'm an IntelliJ user) but I was able to apply the mssql-jdbc_formatter.xml format using https://code.revelc.net/formatter-maven-plugin/ - it changed 117 files in total but most of them were just cases where it stripped trailing spaces off lines (mostly blank lines in the middle of Javadoc comments). It made one indentation change to the test file I touched in this PR so I've committed that change now.

@Jeffery-Wasty
Copy link
Member

Thank you so much. With that I can ask the rest of the team to review, and we can finally get this merged.

@lilgreenbird lilgreenbird moved this from In progress to Under Peer Review in MSSQL JDBC Aug 23, 2022
@Jeffery-Wasty Jeffery-Wasty self-requested a review August 23, 2022 21:12
@tkyc
Copy link
Member

tkyc commented Aug 24, 2022

We'll need to run the PR through some of our internal pipelines.

@Jeffery-Wasty Jeffery-Wasty merged commit 07248a8 into microsoft:main Aug 30, 2022
MSSQL JDBC automation moved this from Under Peer Review to Closed/Merged PRs Aug 30, 2022
@Jeffery-Wasty Jeffery-Wasty removed the Under Review Used for pull requests under review label Aug 30, 2022
@Jeffery-Wasty Jeffery-Wasty removed their assignment Sep 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
MSSQL JDBC
  
Closed/Merged PRs
Development

Successfully merging this pull request may close these issues.

Batch not cleared on failure when using bulk update
4 participants