diff --git a/reference/pgsql/functions/pg-affected-rows.xml b/reference/pgsql/functions/pg-affected-rows.xml index c8bb9d74bc..fc6a3d159a 100644 --- a/reference/pgsql/functions/pg-affected-rows.xml +++ b/reference/pgsql/functions/pg-affected-rows.xml @@ -1,5 +1,5 @@ - + @@ -20,13 +20,13 @@ - <function>pg_affected_rows</function> + <function>pg_affected_rows</function> example ]]> diff --git a/reference/pgsql/functions/pg-cancel-query.xml b/reference/pgsql/functions/pg-cancel-query.xml index 0f543156a5..1a125df6a5 100644 --- a/reference/pgsql/functions/pg-cancel-query.xml +++ b/reference/pgsql/functions/pg-cancel-query.xml @@ -1,11 +1,11 @@ - + pg_cancel_query - Cancel async query + Cancel asynchronous query @@ -20,8 +20,8 @@ pg_query. - See also pg_send_query - and pg_connection_busy + See also pg_send_query and + pg_connection_busy. diff --git a/reference/pgsql/functions/pg-client-encoding.xml b/reference/pgsql/functions/pg-client-encoding.xml index b9c059eba4..a8b0d8a532 100644 --- a/reference/pgsql/functions/pg-client-encoding.xml +++ b/reference/pgsql/functions/pg-client-encoding.xml @@ -1,11 +1,11 @@ - + pg_client_encoding - Get the client encoding + Gets the client encoding @@ -31,8 +31,7 @@ multibyte support and encoding supported. - The function used to be called - pg_clientencoding. + The function used to be called pg_clientencoding. diff --git a/reference/pgsql/functions/pg-close.xml b/reference/pgsql/functions/pg-close.xml index 70362da819..b9864b0515 100644 --- a/reference/pgsql/functions/pg-close.xml +++ b/reference/pgsql/functions/pg-close.xml @@ -1,5 +1,5 @@ - + @@ -26,13 +26,13 @@ - PostgreSQL close example + <function>pg_close</function> example ]]> diff --git a/reference/pgsql/functions/pg-connect.xml b/reference/pgsql/functions/pg-connect.xml index 1cc3dba19e..59a4de1f7d 100644 --- a/reference/pgsql/functions/pg-connect.xml +++ b/reference/pgsql/functions/pg-connect.xml @@ -1,5 +1,5 @@ - + @@ -24,21 +24,21 @@ not be made. connection_string should be a quoted string. - Using pg_connect + Using <function>pg_connect</function> ]]> @@ -61,7 +61,7 @@ $dbconn4 = pg_connect ($conn_string); The old syntax with multiple parameters - $conn = pg_connect ("host", "port", "options", "tty", "dbname") + $conn = pg_connect("host", "port", "options", "tty", "dbname") has been deprecated. diff --git a/reference/pgsql/functions/pg-connection-busy.xml b/reference/pgsql/functions/pg-connection-busy.xml index d18a61ef3f..0328c2c6b9 100644 --- a/reference/pgsql/functions/pg-connection-busy.xml +++ b/reference/pgsql/functions/pg-connection-busy.xml @@ -1,5 +1,5 @@ - + @@ -21,11 +21,11 @@ - pg_connection_busy + <function>pg_connection_busy</function> example - - - See also pg_connection_status and - pg_get_result + pg_get_result. diff --git a/reference/pgsql/functions/pg-connection-reset.xml b/reference/pgsql/functions/pg-connection-reset.xml index 6b84e382b4..77d51bf0d8 100644 --- a/reference/pgsql/functions/pg-connection-reset.xml +++ b/reference/pgsql/functions/pg-connection-reset.xml @@ -1,5 +1,5 @@ - + @@ -24,13 +24,13 @@ ]]> @@ -40,7 +40,7 @@ See also pg_connect, pg_pconnect and - pg_connection_status + pg_connection_status. diff --git a/reference/pgsql/functions/pg-connection-status.xml b/reference/pgsql/functions/pg-connection-status.xml index 4b4cc32ce5..12dd332a5e 100644 --- a/reference/pgsql/functions/pg-connection-status.xml +++ b/reference/pgsql/functions/pg-connection-status.xml @@ -1,5 +1,5 @@ - + @@ -21,11 +21,11 @@ - pg_connection_status + <function>pg_connection_status</function> example @@ -33,9 +33,6 @@ - - - See also pg_connection_busy. diff --git a/reference/pgsql/functions/pg-convert.xml b/reference/pgsql/functions/pg-convert.xml index 630df6c96b..05e0100944 100644 --- a/reference/pgsql/functions/pg-convert.xml +++ b/reference/pgsql/functions/pg-convert.xml @@ -1,5 +1,5 @@ - + @@ -27,13 +27,9 @@ values of assoc_array. Returns an array with the converted values on success, &false; otherwise. - - - This function is experimental. - - + &warn.experimental.func; - See also pg_meta_data + See also pg_meta_data. diff --git a/reference/pgsql/functions/pg-copy-from.xml b/reference/pgsql/functions/pg-copy-from.xml index b1a15249fc..27cfee9911 100644 --- a/reference/pgsql/functions/pg-copy-from.xml +++ b/reference/pgsql/functions/pg-copy-from.xml @@ -1,5 +1,5 @@ - + @@ -25,7 +25,7 @@ &return.success; - See also pg_copy_to + See also pg_copy_to. diff --git a/reference/pgsql/functions/pg-copy-to.xml b/reference/pgsql/functions/pg-copy-to.xml index d9db5498f2..ff35aae4db 100644 --- a/reference/pgsql/functions/pg-copy-to.xml +++ b/reference/pgsql/functions/pg-copy-to.xml @@ -1,5 +1,5 @@ - + @@ -24,7 +24,7 @@ &false; on failure. - See also pg_copy_from + See also pg_copy_from. diff --git a/reference/pgsql/functions/pg-dbname.xml b/reference/pgsql/functions/pg-dbname.xml index 8a6548e523..bfebe92786 100644 --- a/reference/pgsql/functions/pg-dbname.xml +++ b/reference/pgsql/functions/pg-dbname.xml @@ -1,5 +1,5 @@ - + @@ -26,8 +26,8 @@ ]]> diff --git a/reference/pgsql/functions/pg-delete.xml b/reference/pgsql/functions/pg-delete.xml index 57f8bdb31a..87c6a55116 100644 --- a/reference/pgsql/functions/pg-delete.xml +++ b/reference/pgsql/functions/pg-delete.xml @@ -1,5 +1,5 @@ - + @@ -24,12 +24,13 @@ specified, pg_convert is applied to assoc_array with specified option. - - pg_delete - + + + pg_delete + ]]> - - - - - This function is experimental. - - + + + + &warn.experimental.func; - See also pg_convert + See also pg_convert. diff --git a/reference/pgsql/functions/pg-fetch-all.xml b/reference/pgsql/functions/pg-fetch-all.xml index f7d4175c85..f434fb4707 100644 --- a/reference/pgsql/functions/pg-fetch-all.xml +++ b/reference/pgsql/functions/pg-fetch-all.xml @@ -1,5 +1,5 @@ - + @@ -17,31 +17,25 @@ contains all rows (tuples/records) in result resource. It returns &false;, if there are no rows. - - See also pg_fetch_row, - pg_fetch_array, - pg_fetch_object and - pg_fetch_result. - PostgreSQL fetch all + + See also pg_fetch_row, + pg_fetch_array, + pg_fetch_object and + pg_fetch_result. + diff --git a/reference/pgsql/functions/pg-fetch-array.xml b/reference/pgsql/functions/pg-fetch-array.xml index 9c540beb0b..b5acc4f3d0 100644 --- a/reference/pgsql/functions/pg-fetch-array.xml +++ b/reference/pgsql/functions/pg-fetch-array.xml @@ -1,5 +1,5 @@ - + @@ -53,38 +53,34 @@ - PostgreSQL fetch array + <function>pg_fetch_array</function> example ]]> - - See also - pg_fetch_row, - pg_fetch_object and - pg_fetch_result. - From 4.1.0, row became optional. @@ -92,6 +88,12 @@ echo $arr["author"] . " <- array\n"; internal row counter by 1. + + See also + pg_fetch_row, + pg_fetch_object and + pg_fetch_result. + diff --git a/reference/pgsql/functions/pg-fetch-assoc.xml b/reference/pgsql/functions/pg-fetch-assoc.xml index 863f759570..669919ea02 100644 --- a/reference/pgsql/functions/pg-fetch-assoc.xml +++ b/reference/pgsql/functions/pg-fetch-assoc.xml @@ -1,10 +1,10 @@ - + pg_fetch_assoc - Fetch a row as an array + Fetch a row as an associative array Description @@ -19,11 +19,11 @@ &false;, if there are no more rows. - pg_fetch_assoc is an extended version of - pg_fetch_row. In addition to storing the - data in the numeric indices (field index) to the result array, it - also stores the data in associative indices (field name) by - default. + pg_fetch_assoc is equivalent to calling + pg_fetch_array with PGSQL_ASSOC for the + optional third parameter. It only returns an associative array. + If you need the numeric indices, use + pg_fetch_row. row is row (record) number to be @@ -36,23 +36,23 @@ - PostgreSQL fetch array + <function>pg_fetch_assoc</function> example ]]> @@ -62,9 +62,9 @@ echo $arr["author"] . " <- array\n"; See also pg_fetch_row, - pg_fetch_array, - pg_fetch_object, and - pg_fetch_result. + pg_fetch_array, + pg_fetch_object and + pg_fetch_result. diff --git a/reference/pgsql/functions/pg-fetch-object.xml b/reference/pgsql/functions/pg-fetch-object.xml index bdf8eeb9d7..3e55e79d6e 100644 --- a/reference/pgsql/functions/pg-fetch-object.xml +++ b/reference/pgsql/functions/pg-fetch-object.xml @@ -1,5 +1,5 @@ - + @@ -51,60 +51,38 @@ - Postgres fetch object + <function>pg_fetch_object</function> example -

Failed connecting to postgres database

autor." ("; - echo $data->jahr ."): "; - echo $data->titel."
"; +$row = 0; // postgres needs a row counter + +while ($data = pg_fetch_object($qu, $row)) { + echo $data->author . " ("; + echo $data->year . "): "; + echo $data->title . "
"; $row++; } -?> -
-$item[0]."\n";
-    endwhile;
-    $row++;
-}
-echo "----------\n"; 
-?>
-
- ]]> - - See also - pg_query, - pg_fetch_array, - pg_fetch_row and - pg_fetch_result. - From 4.1.0, row became optional. @@ -112,6 +90,14 @@ pg_close ($db_conn); internal row counter counter by 1. + + See also + pg_query, + pg_fetch_array, + pg_fetch_assoc, + pg_fetch_row and + pg_fetch_result. + diff --git a/reference/pgsql/functions/pg-fetch-row.xml b/reference/pgsql/functions/pg-fetch-row.xml index a22e723f5b..bf9f198fe7 100644 --- a/reference/pgsql/functions/pg-fetch-row.xml +++ b/reference/pgsql/functions/pg-fetch-row.xml @@ -1,5 +1,5 @@ - + @@ -26,17 +26,17 @@ - Postgres fetch row + <function>pg_fetch_row</function> example "; + echo "
\n"; } @@ -56,13 +56,6 @@ while ($row = pg_fetch_row($result, $i)) { - - See also - pg_query, - pg_fetch_array, - pg_fetch_object, and - pg_fetch_result. - From 4.1.0, row became optional. @@ -70,6 +63,13 @@ while ($row = pg_fetch_row($result, $i)) { internal row counter by 1. + + See also + pg_query, + pg_fetch_array, + pg_fetch_object and + pg_fetch_result. + diff --git a/reference/pgsql/functions/pg-field-is-null.xml b/reference/pgsql/functions/pg-field-is-null.xml index 5cbd8c5406..52b37549f6 100644 --- a/reference/pgsql/functions/pg-field-is-null.xml +++ b/reference/pgsql/functions/pg-field-is-null.xml @@ -1,5 +1,5 @@ - + @@ -23,7 +23,7 @@ - pg_field_is_null + <function>pg_field_is_null</function> example @@ -42,8 +42,6 @@ - - This function used to be called pg_fieldisnull(). diff --git a/reference/pgsql/functions/pg-field-name.xml b/reference/pgsql/functions/pg-field-name.xml index 3894635957..b33adea2e5 100644 --- a/reference/pgsql/functions/pg-field-name.xml +++ b/reference/pgsql/functions/pg-field-name.xml @@ -1,5 +1,5 @@ - + @@ -25,7 +25,7 @@ - + @@ -31,7 +31,8 @@ - See also pg_field_prtlen and pg_field_type. + See also pg_field_prtlen and + pg_field_type. diff --git a/reference/pgsql/functions/pg-field-type.xml b/reference/pgsql/functions/pg-field-type.xml index d72cd24b5e..de05bb5e2e 100644 --- a/reference/pgsql/functions/pg-field-type.xml +++ b/reference/pgsql/functions/pg-field-type.xml @@ -1,5 +1,5 @@ - + @@ -30,7 +30,8 @@ - See also pg_field_prtlen and pg_field_name. + See also pg_field_prtlen and + pg_field_name. diff --git a/reference/pgsql/functions/pg-get-notify.xml b/reference/pgsql/functions/pg-get-notify.xml index 2001712d23..55efaaea7b 100644 --- a/reference/pgsql/functions/pg-get-notify.xml +++ b/reference/pgsql/functions/pg-get-notify.xml @@ -1,5 +1,5 @@ - + pg_get_notify @@ -29,7 +29,7 @@ - + pg_get_pid @@ -16,16 +16,13 @@ process) PID. PID is useful to check if NOTIFY message is sent from other process or not. - - See also pg_get_notify - PostgreSQL backend PID + + See also pg_get_notify. + diff --git a/reference/pgsql/functions/pg-insert.xml b/reference/pgsql/functions/pg-insert.xml index dd91f7dc14..e42f2370a8 100644 --- a/reference/pgsql/functions/pg-insert.xml +++ b/reference/pgsql/functions/pg-insert.xml @@ -1,5 +1,5 @@ - + @@ -23,16 +23,17 @@ table_name must at least have as many columns as assoc_array has elements. The fieldnames as well as the fieldvalues in table_name must match the indices and values of assoc_array. - pg_insert returns &true; on success, &false; on failure. + &return.success; If options is specified, pg_insert is applied to assoc_array with specified option. - - pg_insert - + + + <function>pg_insert</function> example + ]]> - - - - - This function is experimental. - - + + + + &warn.experimental.func; - See also pg_convert + See also pg_convert. diff --git a/reference/pgsql/functions/pg-lo-create.xml b/reference/pgsql/functions/pg-lo-create.xml index aa350db8e0..231d78c4e1 100644 --- a/reference/pgsql/functions/pg-lo-create.xml +++ b/reference/pgsql/functions/pg-lo-create.xml @@ -1,5 +1,5 @@ - + @@ -23,7 +23,6 @@ access. INV_ARCHIVE has been removed from PostgreSQL itself (version 6.3 and above). It returns large object oid, otherwise it returns &false; if an error occurred. - To use the large object (lo) interface, it is necessary to diff --git a/reference/pgsql/functions/pg-meta-data.xml b/reference/pgsql/functions/pg-meta-data.xml index a90fcc6d79..13fb67beb9 100644 --- a/reference/pgsql/functions/pg-meta-data.xml +++ b/reference/pgsql/functions/pg-meta-data.xml @@ -1,5 +1,5 @@ - + @@ -17,7 +17,7 @@ pg_meta_data returns table definition for - table_name as array. If there is error, it + table_name as an array. If there is error, it returns &false; @@ -26,7 +26,7 @@ - - - - This function is experimental. - - + &warn.experimental.func; - See also pg_convert + See also pg_convert. diff --git a/reference/pgsql/functions/pg-ping.xml b/reference/pgsql/functions/pg-ping.xml index 45f6ecdf39..5abf324f27 100644 --- a/reference/pgsql/functions/pg-ping.xml +++ b/reference/pgsql/functions/pg-ping.xml @@ -1,5 +1,5 @@ - + @@ -17,17 +17,13 @@ reconnect if it is broken. It returns &true; if connection is alive, otherwise &false;. - - See also pg_connection_status and - pg_connection_reset. - - PostgreSQL ping + <function>pg_ping</function> example + + See also pg_connection_status and + pg_connection_reset. + diff --git a/reference/pgsql/functions/pg-put-line.xml b/reference/pgsql/functions/pg-put-line.xml index f554b05a6d..c1ff0a068e 100644 --- a/reference/pgsql/functions/pg-put-line.xml +++ b/reference/pgsql/functions/pg-put-line.xml @@ -1,5 +1,5 @@ - + @@ -28,13 +28,12 @@ - See also pg_end_copy. High-speed insertion of data into a table + + See also pg_end_copy. + diff --git a/reference/pgsql/functions/pg-query.xml b/reference/pgsql/functions/pg-query.xml index 224dc454d0..a622a388e4 100644 --- a/reference/pgsql/functions/pg-query.xml +++ b/reference/pgsql/functions/pg-query.xml @@ -1,5 +1,5 @@ - + @@ -44,7 +44,7 @@ - + This function used to be called pg_exec(). pg_exec() is still available for compatibility @@ -56,8 +56,8 @@ pg_pconnect, pg_fetch_array, pg_fetch_object, - pg_num_rows, - and pg_affected_rows. + pg_num_rows and + pg_affected_rows. diff --git a/reference/pgsql/functions/pg-result-seek.xml b/reference/pgsql/functions/pg-result-seek.xml index d6e822058a..25238dc913 100644 --- a/reference/pgsql/functions/pg-result-seek.xml +++ b/reference/pgsql/functions/pg-result-seek.xml @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ pg_result_seek set internal row offset in - reuslt resource. It returns &false;, if there is error. + result resource. It returns &false;, if there is error. See also pg_fetch_row, diff --git a/reference/pgsql/functions/pg-result-status.xml b/reference/pgsql/functions/pg-result-status.xml index 035721527e..ba77f8cafe 100644 --- a/reference/pgsql/functions/pg-result-status.xml +++ b/reference/pgsql/functions/pg-result-status.xml @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ pg_result_status returns status of result - resource. Possible retun values are PGSQL_EMPTY_QUERY, + resource. Possible return values are PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK, PGSQL_COPY_TO, PGSQL_COPY_FROM, PGSQL_BAD_RESPONSE, PGSQL_NONFATAL_ERROR and PGSQL_FATAL_ERROR. diff --git a/reference/pgsql/functions/pg-select.xml b/reference/pgsql/functions/pg-select.xml index 4b9c652e56..428959e3fe 100644 --- a/reference/pgsql/functions/pg-select.xml +++ b/reference/pgsql/functions/pg-select.xml @@ -1,5 +1,5 @@ - + @@ -27,12 +27,13 @@ pg_convert is applied to assoc_array with specified option. - - pg_select - + + + <function>pg_select</function> example + ]]> - - - - - This function is experimental. - - + + + + &warn.experimental.func; See also pg_convert diff --git a/reference/pgsql/functions/pg-send-query.xml b/reference/pgsql/functions/pg-send-query.xml index 4c92e06a53..34732c5434 100644 --- a/reference/pgsql/functions/pg-send-query.xml +++ b/reference/pgsql/functions/pg-send-query.xml @@ -1,5 +1,5 @@ - + @@ -42,20 +42,21 @@ '; + echo "First call to pg_get_result : $res1\n"; $rows1 = pg_num_rows($res1); - echo $res1.' has '.$rows1.' records

'; - + echo "$res1 has $rows1 records\n\n"; + $res2 = pg_get_result($dbconn); - echo 'second call to pg_get_result(): '.$res2.'
'; + echo "second call to pg_get_result : $res2\n"; $rows2 = pg_num_rows($res2); - echo $res2.' has '.$rows2.' records
'; + echo "$res2 has $rows2 records\n"; ?> ]]> @@ -77,7 +78,7 @@ Resource id #4 has 1 records See also pg_query, pg_cancel_query, pg_get_result and - pg_connection_busy + pg_connection_busy. diff --git a/reference/pgsql/functions/pg-set-client-encoding.xml b/reference/pgsql/functions/pg-set-client-encoding.xml index 9cb61688ae..c481b79cd7 100644 --- a/reference/pgsql/functions/pg-set-client-encoding.xml +++ b/reference/pgsql/functions/pg-set-client-encoding.xml @@ -1,5 +1,5 @@ - + @@ -35,7 +35,7 @@ The function used to be called - pg_setclientencoding. + pg_setclientencoding(). diff --git a/reference/pgsql/functions/pg-trace.xml b/reference/pgsql/functions/pg-trace.xml index ae1b2483eb..d91247fe0e 100644 --- a/reference/pgsql/functions/pg-trace.xml +++ b/reference/pgsql/functions/pg-trace.xml @@ -1,5 +1,5 @@ - + @@ -34,8 +34,9 @@ trace and defaults to the last one opened. - It returns &true; if pathname could be opened - for logging, &false; otherwise. + pg_trace returns &true; if + pathname could be opened for logging, + &false; otherwise. See also fopen and diff --git a/reference/pgsql/functions/pg-update.xml b/reference/pgsql/functions/pg-update.xml index fc8cddba91..f3559a0aee 100644 --- a/reference/pgsql/functions/pg-update.xml +++ b/reference/pgsql/functions/pg-update.xml @@ -1,5 +1,5 @@ - + @@ -25,13 +25,15 @@ pg_convert is applied to data with specified options. - - pg_update - + + + <function>pg_update</function> example + 'AA', 'field2'=>'BB'); + // This is safe, since $_POST is converted automatically $res = pg_update($db, 'post_log', $_POST, $data); if ($res) { @@ -42,15 +44,12 @@ } ?> ]]> - - - - - This function is experimental. - - + + + + &warn.experimental.func; - See also pg_convert + See also pg_convert.