From e7c1447a4e46f8e796a79e93c339dcfcb3bbbeb2 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 20 Nov 2023 20:12:42 +0000 Subject: [PATCH 1/5] Revert "[skip-revcheck] fixed typo in pgsql constants update (#2951)" This reverts commit b286de7e88e2f428a7dd03cc665c8cfb85a09af0. --- reference/pgsql/constants.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/pgsql/constants.xml b/reference/pgsql/constants.xml index 6e99a9419736..90f8365a80b8 100644 --- a/reference/pgsql/constants.xml +++ b/reference/pgsql/constants.xml @@ -891,7 +891,7 @@ To be used with pg_set_error_context_set_visibility, - the context's fields are included in error messages only. + the context's fieds are included in error messages only. This is the default behaviour. Available as of PHP 8.3.0. @@ -905,7 +905,7 @@ To be used with pg_set_error_context_set_visibility, - the context's fields are included in error, notice and warning messages. + the context's fieds are included in error, notice and warning messages. Available as of PHP 8.3.0. From 4b150b97da5292e8166182f8de89111ac582e382 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 20 Nov 2023 20:12:50 +0000 Subject: [PATCH 2/5] Revert "deleted needless example description , part II." This reverts commit 1f5de886472bfa865ba6b4843e099762662b96a2. --- reference/pgsql/functions/pg-pipeline-sync.xml | 3 +++ reference/pgsql/functions/pg-set-error-context-visibility.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/reference/pgsql/functions/pg-pipeline-sync.xml b/reference/pgsql/functions/pg-pipeline-sync.xml index 80932bf8acbf..cf63935e2bb0 100644 --- a/reference/pgsql/functions/pg-pipeline-sync.xml +++ b/reference/pgsql/functions/pg-pipeline-sync.xml @@ -41,6 +41,9 @@ &reftitle.examples; <function>pg_pipeline_sync</function> example + + Description. + <function>pg_set_error_context_visibility</function> example + + Description. + Date: Mon, 20 Nov 2023 20:13:01 +0000 Subject: [PATCH 3/5] Revert "deleted needless example description ." This reverts commit 98f571b5cf00c166195b9f5a2e890f6937e7174c. --- reference/pgsql/functions/pg-pipeline-status.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reference/pgsql/functions/pg-pipeline-status.xml b/reference/pgsql/functions/pg-pipeline-status.xml index 5173a6a797ed..0af6a1f74a11 100644 --- a/reference/pgsql/functions/pg-pipeline-status.xml +++ b/reference/pgsql/functions/pg-pipeline-status.xml @@ -43,6 +43,9 @@ &reftitle.examples; <function>pg_pipeline_status</function> example + + Description. + Date: Mon, 20 Nov 2023 20:13:11 +0000 Subject: [PATCH 4/5] Revert "[PHP 8.3] pgsql constants update (#2941)" This reverts commit 842c0ebebf763837ec46ceb6df4006a749655385. --- reference/pgsql/constants.xml | 79 ----------------------------------- 1 file changed, 79 deletions(-) diff --git a/reference/pgsql/constants.xml b/reference/pgsql/constants.xml index 90f8365a80b8..70e2eeefe68d 100644 --- a/reference/pgsql/constants.xml +++ b/reference/pgsql/constants.xml @@ -870,85 +870,6 @@ - - - PGSQL_SHOW_CONTEXT_NEVER - (int) - - - - To be used with pg_set_error_context_set_visibility, - the context is never shown. - Available as of PHP 8.3.0. - - - - - - PGSQL_SHOW_CONTEXT_ERRORS - (int) - - - - To be used with pg_set_error_context_set_visibility, - the context's fieds are included in error messages only. - This is the default behaviour. - Available as of PHP 8.3.0. - - - - - - PGSQL_SHOW_CONTEXT_ALWAYS - (int) - - - - To be used with pg_set_error_context_set_visibility, - the context's fieds are included in error, notice and warning messages. - Available as of PHP 8.3.0. - - - - - - PGSQL_PIPELINE_ON - (int) - - - - Returned by pg_pipeline_status, - when the connection is in pipeline mode - Available as of PHP 8.3.0. - - - - - - PGSQL_PIPELINE_OFF - (int) - - - - Returned by pg_pipeline_status, - when the connection is not in pipeline mode - Available as of PHP 8.3.0. - - - - - - PGSQL_PIPELINE_ABORTED - (int) - - - - Returned by pg_pipeline_status, - when the connection is in pipeline mode, and an error occurred. - Available as of PHP 8.3.0. - - - diff --git a/reference/pgsql/functions/pg-exit-pipeline-mode.xml b/reference/pgsql/functions/pg-exit-pipeline-mode.xml deleted file mode 100644 index 276aeca2258e..000000000000 --- a/reference/pgsql/functions/pg-exit-pipeline-mode.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - pg_exit_pipeline_mode - Causes a connection to exit pipeline mode - - - - &reftitle.description; - - boolpg_exit_pipeline_mode - PgSql\Connectionconnection - - - Causes a connection to exit pipeline mode if it is currently in pipeline mode with an empty queue and no pending results. - - - - - &reftitle.parameters; - - - - connection - - &pgsql.parameter.connection; - - - - - - - - &reftitle.returnvalues; - - Returns &true; if it succeeds to exit the pipeline mode, assuming - it was in this mode via pg_enter_pipeline_mode, - &false; otherwise. - - - - - &reftitle.examples; - - <function>pg_exit_pipeline_mode</function> example - - -]]> - - &example.outputs; - - - - - - - - &reftitle.seealso; - - pg_enter_pipeline_mode - pg_connect - pg_connect_poll - pg_flush - - - - - diff --git a/reference/pgsql/functions/pg-pipeline-status.xml b/reference/pgsql/functions/pg-pipeline-status.xml deleted file mode 100644 index 0af6a1f74a11..000000000000 --- a/reference/pgsql/functions/pg-pipeline-status.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - pg_pipeline_status - Returns the current pipeline mode status of the libpq connection. - - - - &reftitle.description; - - intpg_pipeline_status - PgSql\Connectionconnection - - - Returns the current pipeline mode status of the libpq connection. - - - - - &reftitle.parameters; - - - - connection - - &pgsql.parameter.connection; - - - - - - - - &reftitle.returnvalues; - - Returns one of the following status: - PGSQL_PIPELINE_ON, PGSQL_PIPELINE_OFF or - PGSQL_PIPELINE_ABORTED. - - - - - &reftitle.examples; - - <function>pg_pipeline_status</function> example - - Description. - - - -]]> - - &example.outputs; - - - - - - - - &reftitle.seealso; - - pg_enter_pipeline_mode - - - - diff --git a/reference/pgsql/functions/pg-pipeline-sync.xml b/reference/pgsql/functions/pg-pipeline-sync.xml deleted file mode 100644 index cf63935e2bb0..000000000000 --- a/reference/pgsql/functions/pg-pipeline-sync.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - pg_pipeline_sync - Marks a synchronization point in a pipeline by sending a sync message and flushing the send buffer. - - - - &reftitle.description; - - boolpg_pipeline_sync - PgSql\Connectionconnection - - - Marks a synchronization point in a pipeline by sending a sync message and flushing the send buffer. - - - - - &reftitle.parameters; - - - - connection - - &pgsql.parameter.connection; - - - - - - - - &reftitle.returnvalues; - - Returns &true; on success or &false; - - - - - &reftitle.examples; - - <function>pg_pipeline_sync</function> example - - Description. - - - -]]> - - &example.outputs; - - - - - - - - &reftitle.seealso; - - pg_enter_pipeline_mode - pg_pipeline_status - - - - diff --git a/reference/pgsql/functions/pg-set-error-context-visibility.xml b/reference/pgsql/functions/pg-set-error-context-visibility.xml deleted file mode 100644 index 4dc80de5053e..000000000000 --- a/reference/pgsql/functions/pg-set-error-context-visibility.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - pg_set_error_context_visibility - - Determines the visibility of the context's error messages. - - - - - &reftitle.description; - - intpg_set_error_context_visibility - PgSql\Connectionconnection - intvisibility - - - Determines the visibility of the context's error messages returned by pg_last_error - and pg_result_error - - - - - &reftitle.parameters; - - - - connection - - &pgsql.parameter.connection; - - - - visibility - - - The required visibility: PGSQL_SHOW_CONTEXT_NEVER, - PGSQL_SHOW_CONTEXT_ERRORS - or PGSQL_SHOW_CONTEXT_ALWAYS. - - - - - - - - - &reftitle.returnvalues; - - The previous visibility level: PGSQL_SHOW_CONTEXT_NEVER, - PGSQL_SHOW_CONTEXT_ERRORS - or PGSQL_SHOW_CONTEXT_ALWAYS. - - - - - &reftitle.examples; - - <function>pg_set_error_context_visibility</function> example - - Description. - - - -]]> - - - - - - &reftitle.seealso; - - - pg_last_error - pg_result_error - - - - - diff --git a/reference/pgsql/functions/pg-trace.xml b/reference/pgsql/functions/pg-trace.xml index 17bd785c6f96..a802480fcb96 100644 --- a/reference/pgsql/functions/pg-trace.xml +++ b/reference/pgsql/functions/pg-trace.xml @@ -14,7 +14,6 @@ stringfilename stringmode"w" PgSql\Connectionnullconnection&null; - inttrace_mode0 pg_trace enables tracing of the PostgreSQL diff --git a/reference/pgsql/versions.xml b/reference/pgsql/versions.xml index aaba7cdaa718..134edaa08590 100644 --- a/reference/pgsql/versions.xml +++ b/reference/pgsql/versions.xml @@ -20,14 +20,12 @@ - - @@ -72,8 +70,6 @@ - - @@ -89,7 +85,6 @@ -