Fix GH-15893: Pdo\Pgsql backport fixes from GH-16124 #16158
Merged
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
|
Hm you updated arginfo but I don't see stub changes? |
|
that was a mistake.. |
devnexen
force-pushed
the
pdo_pgsql_iterable_fix
branch
from
4fe0b0d to
9051f5f
Compare
nielsdos
reviewed
Oct 1, 2024
| if (iter == NULL || EG(exception)) { | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if (iter->funcs->rewind) { |
There was a problem hiding this comment.
I think rewind can throw too, but the exception isn't checked in this case.
There was a problem hiding this comment.
Right, I forgot about that detail.
Maybe would be nice to have some FOREACH_ITERABLE macros 🤔
Girgias
requested changes
Oct 2, 2024
devnexen
force-pushed
the
pdo_pgsql_iterable_fix
branch
from
2bc53b4 to
fd7cb52
Compare
Girgias
approved these changes
Oct 3, 2024
| if (iter == NULL || EG(exception)) { | ||
| RETURN_THROWS(); | ||
| } | ||
|
|
||
| if (iter->funcs->rewind) { |
There was a problem hiding this comment.
Right, I forgot about that detail.
Maybe would be nice to have some FOREACH_ITERABLE macros 🤔
nielsdos
requested changes
Oct 3, 2024
ext/pdo_pgsql/pgsql_driver.c
Outdated
| Z_PARAM_ITERABLE(pg_rows) | ||
| Z_PARAM_OPTIONAL | ||
| Z_PARAM_STRING(pg_delim, pg_delim_len) | ||
| Z_PARAM_STRING_OR_NULL(pg_null_as, pg_null_as_len) |
There was a problem hiding this comment.
In the old zpp this argument was not nullable, it was the last one. The fact this is not caught in CI also means that this case is not tested...
devnexen
force-pushed
the
pdo_pgsql_iterable_fix
branch
from
a275127 to
d2a9918
Compare
nielsdos
approved these changes
Oct 3, 2024
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.
No description provided.