Remove use of SDWORD and SWORD in ODBC extensions #14396
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some different driver managers disagree if this should be 4 or 8 bytes in size. SQLGetDiagRec expects this to be an SQLINTEGER, so we should just use that explicitly instead of hoping that it's the same size. Fixes phpGH-14367
While this hasn't caused issues like the SQLINTEGER/SDWORD confusion has, we should use what SQLDescrimeParam calls for, which is SQLSMALLINT.
|
Thanks! Maybe targeting 8.2 would be a better choice? |
I agree after thinking about it, I'll try to retarget this PR for 8.2 - and hopefully GitHub doesn't confused like last time I tried changing the target branch. |
|
Opened PR GH-14457 that targets 8.2 instead, I'll close this if we're going with it instead. |
|
Merged the 8.2 targeting one instead; has been merged up into 8.3 and master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes instances of SDWORD to SQLINTEGER and instances of SWORD to SQLSMALLINT. There's no point in using these, when we should what the functions define the parameters to actually be. The former change fixes GH-14367.
There are still references to SDWORD and SWORD, but it seems isolated to the Solid driver manager. There is a curious comment in
odbc_column_lengths, as well as some orphan definitions of them for Solid in headers. I have no removed these because I'm not sure if Solid still needs these.I'm targeting master because of the SWORD refactor, but the SDWORD change should presumably be backported as a bug fix that fixes the build.