diff --git a/reference/pdo/drivers.xml b/reference/pdo/drivers.xml index 7158f3b070..83a4b4ae2a 100644 --- a/reference/pdo/drivers.xml +++ b/reference/pdo/drivers.xml @@ -1,6 +1,6 @@ - + @@ -70,15 +70,21 @@ &reference.pdo-cubrid.reference; &reference.pdo-dblib.reference; + &reference.pdo-dblib.pdo-dblib; &reference.pdo-firebird.reference; + &reference.pdo-firebird.pdo-firebird; &reference.pdo-ibm.reference; &reference.pdo-informix.reference; &reference.pdo-mysql.reference; + &reference.pdo-mysql.pdo-mysql; &reference.pdo-sqlsrv.reference; &reference.pdo-oci.reference; &reference.pdo-odbc.reference; + &reference.pdo-odbc.pdo-odbc; &reference.pdo-pgsql.reference; + &reference.pdo-pgsql.pdo-pgsql; &reference.pdo-sqlite.reference; + &reference.pdo-sqlite.pdo-sqlite; + @@ -124,7 +124,7 @@ dblib:host=localhost;dbname=testdb - &reference.pdo-dblib.pdo-dblib; + + @@ -130,7 +130,7 @@ firebird:dbname=localhost:/var/lib/firebird/2.5/data/test.fdb;charset=utf-8;dial - &reference.pdo-firebird.pdo-firebird; + - + @@ -181,7 +181,7 @@ mysql:unix_socket=/tmp/mysql.sock;dbname=testdb - &reference.pdo-mysql.pdo-mysql; + - + @@ -170,7 +170,7 @@ odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq=C:\\db.mdb;Uid=Admin - &reference.pdo-odbc.pdo-odbc; + - + diff --git a/reference/pdo_pgsql/PDO/pgsql/copytofile.xml b/reference/pdo_pgsql/pdo/pgsql/copytofile.xml similarity index 100% rename from reference/pdo_pgsql/PDO/pgsql/copytofile.xml rename to reference/pdo_pgsql/pdo/pgsql/copytofile.xml diff --git a/reference/pdo_pgsql/PDO/pgsql/escapeidentifier.xml b/reference/pdo_pgsql/pdo/pgsql/escapeidentifier.xml similarity index 100% rename from reference/pdo_pgsql/PDO/pgsql/escapeidentifier.xml rename to reference/pdo_pgsql/pdo/pgsql/escapeidentifier.xml diff --git a/reference/pdo_pgsql/PDO/pgsql/getnotify.xml b/reference/pdo_pgsql/pdo/pgsql/getnotify.xml similarity index 100% rename from reference/pdo_pgsql/PDO/pgsql/getnotify.xml rename to reference/pdo_pgsql/pdo/pgsql/getnotify.xml diff --git a/reference/pdo_pgsql/PDO/pgsql/getpid.xml b/reference/pdo_pgsql/pdo/pgsql/getpid.xml similarity index 100% rename from reference/pdo_pgsql/PDO/pgsql/getpid.xml rename to reference/pdo_pgsql/pdo/pgsql/getpid.xml diff --git a/reference/pdo_pgsql/PDO/pgsql/lobcreate.xml b/reference/pdo_pgsql/pdo/pgsql/lobcreate.xml similarity index 100% rename from reference/pdo_pgsql/PDO/pgsql/lobcreate.xml rename to reference/pdo_pgsql/pdo/pgsql/lobcreate.xml diff --git a/reference/pdo_pgsql/PDO/pgsql/lobopen.xml b/reference/pdo_pgsql/pdo/pgsql/lobopen.xml similarity index 92% rename from reference/pdo_pgsql/PDO/pgsql/lobopen.xml rename to reference/pdo_pgsql/pdo/pgsql/lobopen.xml index 765e5499b1..f8aa3aa4af 100644 --- a/reference/pdo_pgsql/PDO/pgsql/lobopen.xml +++ b/reference/pdo_pgsql/pdo/pgsql/lobopen.xml @@ -1,6 +1,6 @@ - + @@ -57,14 +57,6 @@ - - &reftitle.errors; - - 何らかの問題が発生した場合、E_* レベルのエラー - または Exception をスローします。 - - - &reftitle.examples; diff --git a/reference/pdo_pgsql/PDO/pgsql/lobunlink.xml b/reference/pdo_pgsql/pdo/pgsql/lobunlink.xml similarity index 100% rename from reference/pdo_pgsql/PDO/pgsql/lobunlink.xml rename to reference/pdo_pgsql/pdo/pgsql/lobunlink.xml diff --git a/reference/pdo_pgsql/PDO/pgsql/setnoticecallback.xml b/reference/pdo_pgsql/pdo/pgsql/setnoticecallback.xml similarity index 98% rename from reference/pdo_pgsql/PDO/pgsql/setnoticecallback.xml rename to reference/pdo_pgsql/pdo/pgsql/setnoticecallback.xml index 52b03fd650..c4884e365a 100644 --- a/reference/pdo_pgsql/PDO/pgsql/setnoticecallback.xml +++ b/reference/pdo_pgsql/pdo/pgsql/setnoticecallback.xml @@ -1,6 +1,6 @@ - + diff --git a/reference/pdo_pgsql/PDO/pgsqlCopyFromArray.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyFromArray.xml similarity index 96% rename from reference/pdo_pgsql/PDO/pgsqlCopyFromArray.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlCopyFromArray.xml index 3855808ab6..421ddc9947 100644 --- a/reference/pdo_pgsql/PDO/pgsqlCopyFromArray.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyFromArray.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlCopyFromArray diff --git a/reference/pdo_pgsql/PDO/pgsqlCopyFromFile.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyFromFile.xml similarity index 96% rename from reference/pdo_pgsql/PDO/pgsqlCopyFromFile.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlCopyFromFile.xml index d146dec7a9..9ca6bdcce9 100644 --- a/reference/pdo_pgsql/PDO/pgsqlCopyFromFile.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyFromFile.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlCopyFromFile diff --git a/reference/pdo_pgsql/PDO/pgsqlCopyToArray.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyToArray.xml similarity index 96% rename from reference/pdo_pgsql/PDO/pgsqlCopyToArray.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlCopyToArray.xml index c913e317a3..f748b8e77e 100644 --- a/reference/pdo_pgsql/PDO/pgsqlCopyToArray.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyToArray.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlCopyToArray diff --git a/reference/pdo_pgsql/PDO/pgsqlCopyToFile.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyToFile.xml similarity index 96% rename from reference/pdo_pgsql/PDO/pgsqlCopyToFile.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlCopyToFile.xml index da64d66232..febf7ab706 100644 --- a/reference/pdo_pgsql/PDO/pgsqlCopyToFile.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlCopyToFile.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlCopyToFile diff --git a/reference/pdo_pgsql/PDO/pgsqlGetNotify.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlGetNotify.xml similarity index 95% rename from reference/pdo_pgsql/PDO/pgsqlGetNotify.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlGetNotify.xml index b78ecc7fb6..b532a687a4 100644 --- a/reference/pdo_pgsql/PDO/pgsqlGetNotify.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlGetNotify.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlGetNotify diff --git a/reference/pdo_pgsql/PDO/pgsqlGetPid.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlGetPid.xml similarity index 94% rename from reference/pdo_pgsql/PDO/pgsqlGetPid.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlGetPid.xml index 2b496b268b..9670ee4b4f 100644 --- a/reference/pdo_pgsql/PDO/pgsqlGetPid.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlGetPid.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlGetPid diff --git a/reference/pdo_pgsql/PDO/pgsqlLOBCreate.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlLOBCreate.xml similarity index 94% rename from reference/pdo_pgsql/PDO/pgsqlLOBCreate.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlLOBCreate.xml index 40c2f47c9e..7dc63c1cd5 100644 --- a/reference/pdo_pgsql/PDO/pgsqlLOBCreate.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlLOBCreate.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlLOBCreate diff --git a/reference/pdo_pgsql/PDO/pgsqlLOBOpen.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlLOBOpen.xml similarity index 95% rename from reference/pdo_pgsql/PDO/pgsqlLOBOpen.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlLOBOpen.xml index 3cf3c357fa..fc4759453f 100644 --- a/reference/pdo_pgsql/PDO/pgsqlLOBOpen.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlLOBOpen.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlLOBOpen diff --git a/reference/pdo_pgsql/PDO/pgsqlLOBUnlink.xml b/reference/pdo_pgsql/pdo_overloaded/pgsqlLOBUnlink.xml similarity index 94% rename from reference/pdo_pgsql/PDO/pgsqlLOBUnlink.xml rename to reference/pdo_pgsql/pdo_overloaded/pgsqlLOBUnlink.xml index 910fba928f..d32de1d713 100644 --- a/reference/pdo_pgsql/PDO/pgsqlLOBUnlink.xml +++ b/reference/pdo_pgsql/pdo_overloaded/pgsqlLOBUnlink.xml @@ -1,6 +1,6 @@ - + PDO::pgsqlLOBUnlink diff --git a/reference/pdo_pgsql/reference.xml b/reference/pdo_pgsql/reference.xml index 8e0b45cd59..5d7ac9d408 100644 --- a/reference/pdo_pgsql/reference.xml +++ b/reference/pdo_pgsql/reference.xml @@ -1,6 +1,6 @@ - + @@ -154,10 +154,10 @@ pgsql:host=/tmp;port=5432;dbname=testdb;user=bruce;password=mypass - &reference.pdo-pgsql.entities.PDO; + &reference.pdo-pgsql.entities.pdo-overloaded; - &reference.pdo-pgsql.pdo-pgsql; + - + diff --git a/reference/pdo_sqlite/PDO/sqliteCreateCollation.xml b/reference/pdo_sqlite/pdo_overloaded/sqliteCreateCollation.xml similarity index 95% rename from reference/pdo_sqlite/PDO/sqliteCreateCollation.xml rename to reference/pdo_sqlite/pdo_overloaded/sqliteCreateCollation.xml index 1c60d3a8f4..d923f71f1a 100644 --- a/reference/pdo_sqlite/PDO/sqliteCreateCollation.xml +++ b/reference/pdo_sqlite/pdo_overloaded/sqliteCreateCollation.xml @@ -1,6 +1,6 @@ - + PDO::sqliteCreateCollation diff --git a/reference/pdo_sqlite/PDO/sqliteCreateFunction.xml b/reference/pdo_sqlite/pdo_overloaded/sqliteCreateFunction.xml similarity index 96% rename from reference/pdo_sqlite/PDO/sqliteCreateFunction.xml rename to reference/pdo_sqlite/pdo_overloaded/sqliteCreateFunction.xml index e41d5e4e64..88b0836815 100644 --- a/reference/pdo_sqlite/PDO/sqliteCreateFunction.xml +++ b/reference/pdo_sqlite/pdo_overloaded/sqliteCreateFunction.xml @@ -1,6 +1,6 @@ - + diff --git a/reference/pdo_sqlite/reference.xml b/reference/pdo_sqlite/reference.xml index d52fb6dbe4..ba73ed5aa7 100644 --- a/reference/pdo_sqlite/reference.xml +++ b/reference/pdo_sqlite/reference.xml @@ -1,6 +1,6 @@ - + @@ -91,10 +91,10 @@ sqlite: - &reference.pdo-sqlite.entities.PDO; + &reference.pdo-sqlite.entities.pdo-overloaded; - &reference.pdo-sqlite.pdo-sqlite; +