ext/pgsql: adding pg_service() alongside other connection infos. #18198
Conversation
This file contains 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
returns the ongoing name of the service, if there is. available since postgres 18
nielsdos
reviewed
Mar 30, 2025
| @@ -991,6 +992,12 @@ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type | |||
| PQclear(res); | |||
| return; | |||
| } | |||
| #if defined(HAVE_PG_SERVICE) | |||
| case PHP_PG_SERVICE: { | |||
| result = PQservice(pgsql); | |||
There was a problem hiding this comment.
Can this return NULL? If it does, then it will return the interned empty string, in which case the @refcount 1 annotation is wrong.
There was a problem hiding this comment.
Unless there's an exception for interned strings, but I don't believe so? I could be wrong
There was a problem hiding this comment.
Yes it can return NULL.
nielsdos
reviewed
Mar 30, 2025
Zend/Optimizer/zend_func_infos.h
Outdated
| @@ -312,6 +312,9 @@ static const func_info_t func_infos[] = { | |||
| F1("pg_host", MAY_BE_STRING), | |||
| F1("pg_version", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_NULL), | |||
| F1("pg_jit", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_NULL), | |||
| #if defined(HAVE_PG_SERVICE) | |||
There was a problem hiding this comment.
Did you add this by hand, or did you forget to update the optimizer infos after updating the annotation?
There was a problem hiding this comment.
I added after the first round of stub update forgot to rerun again ... should disappear
nielsdos
approved these changes
Mar 30, 2025
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.
returns the ongoing name of the service, if there is. available since postgres 18