Skip to content

Commit

Permalink
Review comments + fix GH-1392
Browse files Browse the repository at this point in the history
  • Loading branch information
@Girgias
Girgias committed Nov 26, 2024
1 parent 5810c08 commit 816a8b9
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 24 deletions.
21 changes: 17 additions & 4 deletions reference/pdo_mysql/constants.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,19 @@
<varlistentry xml:id="pdo.constants.mysql-attr-local-infile-directory">
<term>
<constant>PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY</constant>
(<type>string</type>)
(<type>int</type>)
</term>
<listitem>
<simpara>
&Alias; <constant>Pdo\Mysql::ATTR_LOCAL_INFILE_DIRECTORY</constant>
&Alias; <constant>Pdo\Mysql::ATTR_LOCAL_INFILE_DIRECTORY</constant>.
Available as of PHP 8.1.0.
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo.constants.mysql-attr-init-command">
<term>
<constant>PDO::MYSQL_ATTR_INIT_COMMAND</constant>
(<type>string</type>)
(<type>int</type>)
</term>
<listitem>
<simpara>
Expand Down Expand Up @@ -88,7 +89,7 @@
</term>
<listitem>
<simpara>
&Alias; <constant>Pdo\Mysql::ATTR_DIRECT_QUERY</constant>
&Alias; <constant>PDO::ATTR_EMULATE_PREPARES</constant>
</simpara>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -126,6 +127,18 @@
</listitem>
</varlistentry>

<varlistentry xml:id="pdo.constants.mysql-attr-server-public-key">
<term>
<constant>PDO::MYSQL_ATTR_SERVER_PUBLIC_KEY</constant>
(<type>int</type>)
</term>
<listitem>
<simpara>
&Alias; <constant>Pdo\Mysql::ATTR_SERVER_PUBLIC_KEY</constant>
</simpara>
</listitem>
</varlistentry>

<varlistentry xml:id="pdo.constants.mysql-attr-ssl-ca">
<term>
<constant>PDO::MYSQL_ATTR_SSL_CA</constant>
Expand Down
58 changes: 38 additions & 20 deletions reference/pdo_mysql/pdo-mysql.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,9 @@ foreach ($unbufferedResult as $row) {
designated directory.
Available as of PHP 8.1.0.
</simpara>
<note>
<simpara>
Can only be used in the <parameter>driver_options</parameter>
array when constructing a new database handle.
</simpara>
</note>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-init-command">
Expand All @@ -255,12 +252,9 @@ foreach ($unbufferedResult as $row) {
Command to execute when connecting to the MySQL server.
Will automatically be re-executed when reconnecting.
</simpara>
<note>
<simpara>
Can only be used in the <parameter>driver_options</parameter>
array when constructing a new database handle.
</simpara>
</note>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-read-default-file">
Expand Down Expand Up @@ -306,7 +300,7 @@ foreach ($unbufferedResult as $row) {
<term><constant>Pdo\Mysql::ATTR_DIRECT_QUERY</constant></term>
<listitem>
<simpara>
Perform direct queries, don't use prepared statements.
&Alias; <constant>PDO::ATTR_EMULATE_PREPARES</constant>.
</simpara>
</listitem>
</varlistentry>
Expand All @@ -317,6 +311,9 @@ foreach ($unbufferedResult as $row) {
Return the number of found (matched) rows,
not the number of changed rows.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ignore-space">
Expand All @@ -326,6 +323,9 @@ foreach ($unbufferedResult as $row) {
Permit spaces after SQL function names.
Makes all SQL functions names reserved words.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-max-buffer-size">
Expand All @@ -349,20 +349,20 @@ foreach ($unbufferedResult as $row) {
<methodname>PDO::prepare</methodname> and
<methodname>PDO::query</methodname> when set to &false;.
</simpara>
<note>
<simpara>
Can only be used in the <parameter>driver_options</parameter>
array when constructing a new database handle.
</simpara>
</note>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-server-public-key">
<term><constant>Pdo\Mysql::ATTR_SERVER_PUBLIC_KEY</constant></term>
<listitem>
<simpara>
TODO, Available since when?
<acronym>RSA</acronym> public key file used with the SHA-256 based authentication.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-key">
Expand All @@ -371,6 +371,9 @@ foreach ($unbufferedResult as $row) {
<simpara>
The file path to the <acronym>SSL</acronym> key.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-cert">
Expand All @@ -379,6 +382,9 @@ foreach ($unbufferedResult as $row) {
<simpara>
The file path to the <acronym>SSL</acronym> certificate.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-ca">
Expand All @@ -387,6 +393,9 @@ foreach ($unbufferedResult as $row) {
<simpara>
The file path to the <acronym>SSL</acronym> certificate authority.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-capath">
Expand All @@ -397,6 +406,9 @@ foreach ($unbufferedResult as $row) {
<acronym>SSL</acronym> <acronym>CA</acronym> certificates,
which are stored in <acronym>PEM</acronym> format.
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-cipher">
Expand All @@ -407,6 +419,9 @@ foreach ($unbufferedResult as $row) {
<acronym>SSL</acronym> encryption, in a format understood by OpenSSL.
For example: <literal>DHE-RSA-AES256-SHA:AES128-SHA</literal>
</simpara>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-verify-server-cert">
Expand All @@ -421,6 +436,9 @@ foreach ($unbufferedResult as $row) {
This option is available only with mysqlnd.
</simpara>
</note>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
<xi:fallback/>
</xi:include>
</listitem>
</varlistentry>
</variablelist>
Expand Down

0 comments on commit 816a8b9

Please sign in to comment.