From 9d0ff3eb490ddfbdf617fc4b025163c7963ec71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Sat, 28 Dec 2024 09:31:21 -0300 Subject: [PATCH 1/4] Rename PDO driver titleabrevs --- reference/pdo_cubrid/reference.xml | 12 ++++++------ reference/pdo_dblib/reference.xml | 2 +- reference/pdo_firebird/reference.xml | 2 +- reference/pdo_ibm/reference.xml | 24 ++++++++++++------------ reference/pdo_informix/reference.xml | 4 ++-- reference/pdo_mysql/reference.xml | 2 +- reference/pdo_oci/reference.xml | 4 ++-- reference/pdo_odbc/reference.xml | 2 +- reference/pdo_pgsql/reference.xml | 2 +- reference/pdo_sqlite/reference.xml | 2 +- reference/pdo_sqlsrv/reference.xml | 28 ++++++++++++++-------------- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/reference/pdo_cubrid/reference.xml b/reference/pdo_cubrid/reference.xml index adab39d403bd..34065b66a215 100644 --- a/reference/pdo_cubrid/reference.xml +++ b/reference/pdo_cubrid/reference.xml @@ -1,7 +1,7 @@ CUBRID Functions (PDO_CUBRID) - CUBRID (PDO) + CUBRID PDO Driver
&reftitle.intro; @@ -64,7 +64,7 @@
Multiple SQL Statements - + PDO_CUBRID supports Multiple SQL statements. Multiple SQL statements are separated by semicolons (;). @@ -168,9 +168,9 @@ fpassthru($result[0]); $conn_str ="cubrid:dbname=demodb;host=localhost;port=33000"; $cubrid_pdo = new PDO($conn_str, 'dba', ''); -$cubrid_pdo->exec("DROP TABLE if exists test_tbl"); +$cubrid_pdo->exec("DROP TABLE if exists test_tbl"); $cubrid_pdo->exec("CREATE TABLE test_tbl (col_1 SET(VARCHAR))"); - + $sql_stmt_insert = "INSERT INTO test_tbl VALUES (?);"; $stmt = $cubrid_pdo->prepare($sql_stmt_insert); $data = array("abc","def","ghi"); @@ -190,9 +190,9 @@ var_Dump($ret); $conn_str ="cubrid:dbname=demodb;host=localhost;port=33000"; $cubrid_pdo = new PDO($conn_str, 'dba', ''); -$cubrid_pdo->exec("DROP TABLE if exists test_tbl"); +$cubrid_pdo->exec("DROP TABLE if exists test_tbl"); $cubrid_pdo->exec("CREATE TABLE test_tbl (col_1 SET(int))"); - + $sql_stmt_insert = "INSERT INTO test_tbl VALUES (?);"; $stmt = $cubrid_pdo->prepare($sql_stmt_insert); $data = array(1,2,3,4); diff --git a/reference/pdo_dblib/reference.xml b/reference/pdo_dblib/reference.xml index 53dd24994998..7ea21f4f6bd7 100644 --- a/reference/pdo_dblib/reference.xml +++ b/reference/pdo_dblib/reference.xml @@ -4,7 +4,7 @@ Microsoft SQL Server and Sybase Functions (PDO_DBLIB) - MS SQL Server (PDO) + MS SQL Server PDO Driver)
diff --git a/reference/pdo_firebird/reference.xml b/reference/pdo_firebird/reference.xml index 18b8d3d4587b..8588ea1d2ece 100644 --- a/reference/pdo_firebird/reference.xml +++ b/reference/pdo_firebird/reference.xml @@ -4,7 +4,7 @@ Firebird Functions (PDO_FIREBIRD) - Firebird (PDO) + Firebird PDO Driver
diff --git a/reference/pdo_ibm/reference.xml b/reference/pdo_ibm/reference.xml index 6f3c0a2eecec..6093755d5efb 100644 --- a/reference/pdo_ibm/reference.xml +++ b/reference/pdo_ibm/reference.xml @@ -2,7 +2,7 @@ IBM Functions (PDO_IBM) - IBM (PDO) + IBM PDO Driver
@@ -29,8 +29,8 @@ &reftitle.description; - The PDO_IBM Data Source Name (DSN) is based on the IBM CLI DSN. The major - components of the PDO_IBM DSN are: + The PDO_IBM Data Source Name (DSN) is based on the IBM CLI DSN. The major + components of the PDO_IBM DSN are: DSN prefix @@ -48,20 +48,20 @@ - a) Data source setup using db2cli.ini + a) Data source setup using db2cli.ini or odbc.ini - b) Catalogued database name i.e. database alias in the DB2 client + b) Catalogued database name i.e. database alias in the DB2 client catalog - c) Complete connection string in the following format: - DRIVER={IBM DB2 ODBC DRIVER};DATABASE=database;HOSTNAME=hostname;PORT=port;PROTOCOL=TCPIP;UID=username;PWD=password; + c) Complete connection string in the following format: + DRIVER={IBM DB2 ODBC DRIVER};DATABASE=database;HOSTNAME=hostname;PORT=port;PROTOCOL=TCPIP;UID=username;PWD=password; where the parameters represent the following values: @@ -122,7 +122,7 @@ PDO_IBM DSN example using <filename>db2cli.ini</filename> - The following example shows a PDO_IBM DSN for connecting to an DB2 + The following example shows a PDO_IBM DSN for connecting to an DB2 database cataloged as DB2_9 in db2cli.ini: PDO_IBM DSN example using a connection string - The following example shows a PDO_IBM DSN for connecting to an DB2 - database named testdb using the DB2 CLI - connection string syntax. + The following example shows a PDO_IBM DSN for connecting to an DB2 + database named testdb using the DB2 CLI + connection string syntax. - + diff --git a/reference/pdo_informix/reference.xml b/reference/pdo_informix/reference.xml index b5424e07f396..7a195ee78694 100644 --- a/reference/pdo_informix/reference.xml +++ b/reference/pdo_informix/reference.xml @@ -2,7 +2,7 @@ Informix Functions (PDO_INFORMIX) - Informix (PDO) + Informix PDO Driver
@@ -108,7 +108,7 @@ $db = new PDO("informix:host=host.domain.com; service=9800; - + diff --git a/reference/pdo_mysql/reference.xml b/reference/pdo_mysql/reference.xml index eb2056c3c94b..2a328bde8fe7 100644 --- a/reference/pdo_mysql/reference.xml +++ b/reference/pdo_mysql/reference.xml @@ -4,7 +4,7 @@ MySQL Functions (PDO_MYSQL) - MySQL (PDO) + MySQL PDO Driver
diff --git a/reference/pdo_oci/reference.xml b/reference/pdo_oci/reference.xml index 28b7fe69fc20..9c89aaf95cf7 100644 --- a/reference/pdo_oci/reference.xml +++ b/reference/pdo_oci/reference.xml @@ -4,9 +4,9 @@ Oracle Functions (PDO_OCI) - Oracle (PDO) + Oracle PDO Driver - + &reference.pdo-oci.configure; &reference.pdo-oci.constants; diff --git a/reference/pdo_odbc/reference.xml b/reference/pdo_odbc/reference.xml index 7b52b97cc7d6..e5d45497ff23 100644 --- a/reference/pdo_odbc/reference.xml +++ b/reference/pdo_odbc/reference.xml @@ -4,7 +4,7 @@ ODBC and DB2 Functions (PDO_ODBC) - ODBC and DB2 (PDO) + ODBC and DB2 PDO Driver
diff --git a/reference/pdo_pgsql/reference.xml b/reference/pdo_pgsql/reference.xml index 7aea9bfe99ba..bf585dc414c0 100644 --- a/reference/pdo_pgsql/reference.xml +++ b/reference/pdo_pgsql/reference.xml @@ -4,7 +4,7 @@ PostgreSQL Functions (PDO_PGSQL) - PostgreSQL (PDO) + PostgreSQL PDO Driver
diff --git a/reference/pdo_sqlite/reference.xml b/reference/pdo_sqlite/reference.xml index 70bd4fc651fe..82e77257e424 100644 --- a/reference/pdo_sqlite/reference.xml +++ b/reference/pdo_sqlite/reference.xml @@ -4,7 +4,7 @@ SQLite Functions (PDO_SQLITE) - SQLite (PDO) + SQLite PDO Driver
diff --git a/reference/pdo_sqlsrv/reference.xml b/reference/pdo_sqlsrv/reference.xml index 8ad501bf2a66..fd895486af64 100644 --- a/reference/pdo_sqlsrv/reference.xml +++ b/reference/pdo_sqlsrv/reference.xml @@ -2,7 +2,7 @@ Microsoft SQL Server Functions (PDO_SQLSRV) - MS SQL Server (PDO) + MS SQL Server PDO Driver
@@ -10,7 +10,7 @@ PDO_SQLSRV is a driver that implements the PHP Data Objects (PDO) interface - to enable access from PHP to MS SQL Server (starting with SQL Server 2005) + to enable access from PHP to MS SQL Server (starting with SQL Server 2005) and SQL Azure databases.
@@ -49,7 +49,7 @@ ConnectionPooling - Specifies whether the connection is assigned from a connection pool + Specifies whether the connection is assigned from a connection pool (1 or &true;) or not (0 or &false;). @@ -66,7 +66,7 @@ Encrypt - Specifies whether the communication with SQL Server is encrypted + Specifies whether the communication with SQL Server is encrypted (1 or &true;) or unencrypted (0 or &false;). @@ -75,7 +75,7 @@ Failover_Partner - Specifies the server and instance of the database's mirror (if enabled + Specifies the server and instance of the database's mirror (if enabled and configured) to use when the primary server is unavailable. @@ -100,7 +100,7 @@ QuotedId - Specifies whether to use SQL-92 rules for quoted identifiers (1 or &true;) + Specifies whether to use SQL-92 rules for quoted identifiers (1 or &true;) or to use legacy Transact-SQL rules (0 or &false;). @@ -125,7 +125,7 @@ TraceOn - Specifies whether ODBC tracing is enabled (1 or &true;) or disabled + Specifies whether ODBC tracing is enabled (1 or &true;) or disabled (0 or &false;) for the connection being established. @@ -134,9 +134,9 @@ TransactionIsolation - Specifies the transaction isolation level. The accepted values for this - option are PDO::SQLSRV_TXN_READ_UNCOMMITTED, PDO::SQLSRV_TXN_READ_COMMITTED, - PDO::SQLSRV_TXN_REPEATABLE_READ, PDO::SQLSRV_TXN_SNAPSHOT, and + Specifies the transaction isolation level. The accepted values for this + option are PDO::SQLSRV_TXN_READ_UNCOMMITTED, PDO::SQLSRV_TXN_READ_COMMITTED, + PDO::SQLSRV_TXN_REPEATABLE_READ, PDO::SQLSRV_TXN_SNAPSHOT, and PDO::SQLSRV_TXN_SERIALIZABLE. @@ -145,7 +145,7 @@ TrustServerCertificate - Specifies whether the client should trust (1 or &true;) or reject + Specifies whether the client should trust (1 or &true;) or reject (0 or &false;) a self-signed server certificate. @@ -176,7 +176,7 @@ $c = new PDO("sqlsrv:Server=localhost;Database=testdb", "UserName", "Password"); - The following example shows how to connect to a MS SQL Server database on + The following example shows how to connect to a MS SQL Server database on a specified port: - The following example shows how to connecto to a SQL Azure database with - server ID 12345abcde. Note that when you connect to SQL Azure with PDO, + The following example shows how to connecto to a SQL Azure database with + server ID 12345abcde. Note that when you connect to SQL Azure with PDO, your username will be UserName@12345abcde (UserName@ServerId). Date: Sat, 28 Dec 2024 10:19:35 -0300 Subject: [PATCH 2/4] Review. Co-authored-by: Kamil Tekiela --- reference/pdo_dblib/reference.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/pdo_dblib/reference.xml b/reference/pdo_dblib/reference.xml index 7ea21f4f6bd7..a899484de6c2 100644 --- a/reference/pdo_dblib/reference.xml +++ b/reference/pdo_dblib/reference.xml @@ -4,7 +4,7 @@ Microsoft SQL Server and Sybase Functions (PDO_DBLIB) - MS SQL Server PDO Driver) + MS SQL Server PDO Driver
From df1be294c5ec2333f00304f3bc0efd4330ef6576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Sat, 28 Dec 2024 11:55:33 -0300 Subject: [PATCH 3/4] Rename PDO driver title --- reference/pdo_cubrid/reference.xml | 2 +- reference/pdo_firebird/reference.xml | 2 +- reference/pdo_ibm/reference.xml | 2 +- reference/pdo_informix/reference.xml | 2 +- reference/pdo_mysql/reference.xml | 2 +- reference/pdo_oci/reference.xml | 2 +- reference/pdo_odbc/reference.xml | 2 +- reference/pdo_pgsql/reference.xml | 2 +- reference/pdo_sqlite/reference.xml | 2 +- reference/pdo_sqlsrv/reference.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/reference/pdo_cubrid/reference.xml b/reference/pdo_cubrid/reference.xml index 34065b66a215..b308fa6829a3 100644 --- a/reference/pdo_cubrid/reference.xml +++ b/reference/pdo_cubrid/reference.xml @@ -1,6 +1,6 @@ - CUBRID Functions (PDO_CUBRID) + CUBRID PDO Driver (PDO_CUBRID) CUBRID PDO Driver diff --git a/reference/pdo_firebird/reference.xml b/reference/pdo_firebird/reference.xml index 8588ea1d2ece..12ed5ff8e3d3 100644 --- a/reference/pdo_firebird/reference.xml +++ b/reference/pdo_firebird/reference.xml @@ -3,7 +3,7 @@ - Firebird Functions (PDO_FIREBIRD) + Firebird PDO Driver (PDO_FIREBIRD) Firebird PDO Driver diff --git a/reference/pdo_ibm/reference.xml b/reference/pdo_ibm/reference.xml index 6093755d5efb..1e34f476f67b 100644 --- a/reference/pdo_ibm/reference.xml +++ b/reference/pdo_ibm/reference.xml @@ -1,7 +1,7 @@ - IBM Functions (PDO_IBM) + IBM PDO Driver (PDO_IBM) IBM PDO Driver diff --git a/reference/pdo_informix/reference.xml b/reference/pdo_informix/reference.xml index 7a195ee78694..d9c934adc4ad 100644 --- a/reference/pdo_informix/reference.xml +++ b/reference/pdo_informix/reference.xml @@ -1,7 +1,7 @@ - Informix Functions (PDO_INFORMIX) + Informix PDO Driver (PDO_INFORMIX) Informix PDO Driver diff --git a/reference/pdo_mysql/reference.xml b/reference/pdo_mysql/reference.xml index 2a328bde8fe7..4ef1dc5d512b 100644 --- a/reference/pdo_mysql/reference.xml +++ b/reference/pdo_mysql/reference.xml @@ -3,7 +3,7 @@ - MySQL Functions (PDO_MYSQL) + MySQL PDO Driver (PDO_MYSQL) MySQL PDO Driver diff --git a/reference/pdo_oci/reference.xml b/reference/pdo_oci/reference.xml index 9c89aaf95cf7..f1f1ed75ccda 100644 --- a/reference/pdo_oci/reference.xml +++ b/reference/pdo_oci/reference.xml @@ -3,7 +3,7 @@ - Oracle Functions (PDO_OCI) + Oracle PDO Driver (PDO_OCI) Oracle PDO Driver diff --git a/reference/pdo_odbc/reference.xml b/reference/pdo_odbc/reference.xml index e5d45497ff23..52e5b1282571 100644 --- a/reference/pdo_odbc/reference.xml +++ b/reference/pdo_odbc/reference.xml @@ -3,7 +3,7 @@ - ODBC and DB2 Functions (PDO_ODBC) + ODBC and DB2 PDO Driver (PDO_ODBC) ODBC and DB2 PDO Driver diff --git a/reference/pdo_pgsql/reference.xml b/reference/pdo_pgsql/reference.xml index bf585dc414c0..78169f4735dd 100644 --- a/reference/pdo_pgsql/reference.xml +++ b/reference/pdo_pgsql/reference.xml @@ -3,7 +3,7 @@ - PostgreSQL Functions (PDO_PGSQL) + PostgreSQL PDO Driver (PDO_PGSQL) PostgreSQL PDO Driver diff --git a/reference/pdo_sqlite/reference.xml b/reference/pdo_sqlite/reference.xml index 82e77257e424..bb7d982897dd 100644 --- a/reference/pdo_sqlite/reference.xml +++ b/reference/pdo_sqlite/reference.xml @@ -3,7 +3,7 @@ - SQLite Functions (PDO_SQLITE) + SQLite PDO Driver (PDO_SQLITE) SQLite PDO Driver diff --git a/reference/pdo_sqlsrv/reference.xml b/reference/pdo_sqlsrv/reference.xml index fd895486af64..cb74f09349c4 100644 --- a/reference/pdo_sqlsrv/reference.xml +++ b/reference/pdo_sqlsrv/reference.xml @@ -1,7 +1,7 @@ - Microsoft SQL Server Functions (PDO_SQLSRV) + Microsoft SQL Server PDO Driver (PDO_SQLSRV) MS SQL Server PDO Driver From 82852ed2e720f00835915b3bbeb3f3fd867209f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Fri, 3 Jan 2025 11:23:10 -0300 Subject: [PATCH 4/4] Rename PDO driver title --- reference/pdo_dblib/reference.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/pdo_dblib/reference.xml b/reference/pdo_dblib/reference.xml index a899484de6c2..7368b239731e 100644 --- a/reference/pdo_dblib/reference.xml +++ b/reference/pdo_dblib/reference.xml @@ -3,7 +3,7 @@ - Microsoft SQL Server and Sybase Functions (PDO_DBLIB) + Microsoft SQL Server and Sybase PDO Driver (PDO_DBLIB) MS SQL Server PDO Driver