Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync odbc with EN (c39225b6dd23f358824f44f5b8c733517b11830b) #2014

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Sync odbc with EN (c39225b6dd23f358824f44f5b8c733517b11830b) #2014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions reference/uodbc/functions/odbc-connect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: yannick Status: ready -->
<!-- EN-Revision: c39225b6dd23f358824f44f5b8c733517b11830b Maintainer: yannick Status: ready -->
<!-- Reviewed: yes -->
<refentry xml:id="function.odbc-connect" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -13,8 +12,8 @@
<methodsynopsis>
<type class="union"><type>Odbc\Connection</type><type>false</type></type><methodname>odbc_connect</methodname>
<methodparam><type>string</type><parameter>dsn</parameter></methodparam>
<methodparam><type>string</type><parameter>user</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>user</parameter><initializer>&null;</initializer></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter><initializer>&null;</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>cursor_option</parameter><initializer><constant>SQL_CUR_USE_DRIVER</constant></initializer></methodparam>
</methodsynopsis>
<simpara>
Expand Down Expand Up @@ -53,6 +52,9 @@
<listitem>
<para>
Le nom d'utilisateur.
Ce paramètre est ignoré si <parameter>dsn</parameter> contient <literal>uid</literal>.
Pour une connexion sans spécifier un <parameter>user</parameter>,
utiliser &null;.
</para>
</listitem>
</varlistentry>
Expand All @@ -61,6 +63,9 @@
<listitem>
<para>
Le mot de passe.
Ce paramètre est ignoré si <parameter>dsn</parameter> contient <literal>pwd</literal>.
Pour une connexion sans spécifier un <parameter>password</parameter>,
utiliser &null;.
</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -120,6 +125,7 @@
</thead>
<tbody>
&odbc.changelog.connection-return;
&odbc.changelog.credential-params;
</tbody>
</tgroup>
</informaltable>
Expand All @@ -133,7 +139,7 @@
<programlisting role="php">
<![CDATA[
<?php
// Microsoft SQL Server utilise le pilote SQL Native Client 10.0 ODBC Driver :
// Microsoft SQL Server utilise le pilote SQL Native Client 10.0 ODBC Driver :
// il permet les connexions à SQL 7, 2000, 2005 et 2008
$connection = odbc_connect("Driver={SQL Server Native Client 10.0};Server=$server;Database=$database;", $user, $password);

Expand Down
8 changes: 4 additions & 4 deletions reference/uodbc/functions/odbc-pconnect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: yannick Status: ready -->
<!-- EN-Revision: c39225b6dd23f358824f44f5b8c733517b11830b Maintainer: yannick Status: ready -->
<!-- Reviewed: yes -->
<refentry xml:id="function.odbc-pconnect" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -13,8 +12,8 @@
<methodsynopsis>
<type class="union"><type>Odbc\Connection</type><type>false</type></type><methodname>odbc_pconnect</methodname>
<methodparam><type>string</type><parameter>dsn</parameter></methodparam>
<methodparam><type>string</type><parameter>user</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>user</parameter><initializer>&null;</initializer></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter><initializer>&null;</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>cursor_option</parameter><initializer><constant>SQL_CUR_USE_DRIVER</constant></initializer></methodparam>
</methodsynopsis>
<para>
Expand Down Expand Up @@ -58,6 +57,7 @@
</thead>
<tbody>
&odbc.changelog.connection-return;
&odbc.changelog.credential-params;
</tbody>
</tgroup>
</informaltable>
Expand Down