fix #29011 (missing charset parameter description)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@162665 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Antony Dovgal 2004-07-05 08:58:49 +00:00
parent b45caca93f
commit 4df926026f
6 changed files with 48 additions and 6 deletions

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.3 $ -->
<!-- $Revision: 1.4 $ -->
<refentry id="function.oci-connect">
<refnamediv>
<refname>oci_connect</refname>
@ -12,6 +12,7 @@
<methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
<function>oci_connect</function> returns a connection identifier
@ -35,6 +36,12 @@
connection, use <function>oci_new_connect</function>.
</simpara>
</note>
<para>
Using Oracle server version 9.2 and greater, you can indicate
<parameter>charset</parameter> parameter, which will be used in the new
connection. If you're using Oracle server < 9.2, this parameter will be
ignored and NLS_LANG environment variable will be used instead.
</para>
<para>
<example>
<title><function>oci_connect</function> example</title>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.3 $ -->
<!-- $Revision: 1.4 $ -->
<refentry id="function.oci-new-connect">
<refnamediv>
<refname>oci_new_connect</refname>
@ -12,6 +12,7 @@
<methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
<function>oci_new_connect</function> creates a new connection to an Oracle
@ -22,6 +23,12 @@
<literal>TWO_TASK</literal> to determine the name of local Oracle
instance and location of <filename>tnsnames.ora</filename> accordingly.
</para>
<para>
Using Oracle server version 9.2 and greater, you can indicate
<parameter>charset</parameter> parameter, which will be used in the new
connection. If you're using Oracle server < 9.2, this parameter will be
ignored and NLS_LANG environment variable will be used instead.
</para>
<para>
<function>oci_new_connect</function> forces the creation of a new connection.
This should be used if you need to isolate a set of transactions. By

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.4 $ -->
<!-- $Revision: 1.5 $ -->
<refentry id="function.oci-pconnect">
<refnamediv>
<refname>oci_pconnect</refname>
@ -12,6 +12,7 @@
<methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
<function>oci_pconnect</function> creates a new persistent connection to
@ -22,6 +23,12 @@
<literal>TWO_TASK</literal> to determine the name of local Oracle
instance and location of <filename>tnsnames.ora</filename> accordingly.
</para>
<para>
Using Oracle server version 9.2 and greater, you can indicate
<parameter>charset</parameter> parameter, which will be used in the new
connection. If you're using Oracle server < 9.2, this parameter will be
ignored and NLS_LANG environment variable will be used instead.
</para>
<para>
<function>oci_pconnect</function> returns connection identifier or
&false; on error.

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.12 $ -->
<!-- $Revision: 1.13 $ -->
<!--
DO NOT TRANSLATE THIS FILE.
@ -20,6 +20,7 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
<methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
<function>ocilogon</function> returns an connection identifier
@ -30,6 +31,12 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
environment variables ORACLE_SID (Oracle instance) or TWO_TASK
(tnsnames.ora) to determine which database to connect to.
</para>
<para>
Using Oracle server version 9.2 and greater, you can indicate
<parameter>charset</parameter> parameter, which will be used in the new
connection. If you're using Oracle server < 9.2, this parameter will be
ignored and NLS_LANG environment variable will be used instead.
</para>
<para>Connections are shared at the page level when using
<function>ocilogon</function>. This means that commits and
rollbacks apply to all open transactions in the page, even if you

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.11 $ -->
<!-- $Revision: 1.12 $ -->
<!--
DO NOT TRANSLATE THIS FILE.
@ -20,6 +20,7 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
<methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
<function>ocinlogon</function> creates a new connection to an
@ -39,6 +40,12 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
connections open using <function>ocinlogon</function>, all
commits and rollbacks apply to the specified connection only.
</para>
<para>
Using Oracle server version 9.2 and greater, you can indicate
<parameter>charset</parameter> parameter, which will be used in the new
connection. If you're using Oracle server < 9.2, this parameter will be
ignored and NLS_LANG environment variable will be used instead.
</para>
<para>
This example demonstrates how the connections are separated.
<example>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.7 $ -->
<!-- $Revision: 1.8 $ -->
<!--
DO NOT TRANSLATE THIS FILE.
@ -22,6 +22,7 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
<methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
<function>ociplogon</function> creates a persistent connection to
@ -33,6 +34,12 @@ PLEASE, TRANSLATE THE APPROPRIATE NEW FILE.
or <varname>TWO_TASK</varname>
(tnsnames.ora) to determine which database to connect to.
</para>
<para>
Using Oracle server version 9.2 and greater, you can indicate
<parameter>charset</parameter> parameter, which will be used in the new
connection. If you're using Oracle server < 9.2, this parameter will be
ignored and NLS_LANG environment variable will be used instead.
</para>
<note>
<para>
This function was renamed to <function>oci_pconnect</function>