From 4f1897928902b04d08e0d8be04e0d27dc02da70b Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Wed, 23 Sep 2020 13:53:42 +0000 Subject: [PATCH] Switch to ODBC 3 parlance The ODBC 2 terms "qualifier" and "owner" have been replaced with "catalog" and "schema", respectively, in ODBC 3. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350623 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../uodbc/functions/odbc-columnprivileges.xml | 10 ++++----- reference/uodbc/functions/odbc-columns.xml | 4 ++-- .../uodbc/functions/odbc-primarykeys.xml | 8 +++---- .../uodbc/functions/odbc-procedurecolumns.xml | 8 +++---- reference/uodbc/functions/odbc-procedures.xml | 8 +++---- .../uodbc/functions/odbc-specialcolumns.xml | 4 ++-- reference/uodbc/functions/odbc-statistics.xml | 8 +++---- .../uodbc/functions/odbc-tableprivileges.xml | 8 +++---- reference/uodbc/functions/odbc-tables.xml | 22 +++++++++---------- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/reference/uodbc/functions/odbc-columnprivileges.xml b/reference/uodbc/functions/odbc-columnprivileges.xml index 750d42ea80..4c6861c75c 100644 --- a/reference/uodbc/functions/odbc-columnprivileges.xml +++ b/reference/uodbc/functions/odbc-columnprivileges.xml @@ -10,8 +10,8 @@ resourceodbc_columnprivileges resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringtable_name stringcolumn_name @@ -30,7 +30,7 @@ - qualifier + catalog The qualifier. @@ -38,7 +38,7 @@ - owner + schema The owner. @@ -64,7 +64,7 @@ - The owner, table_name, and + The schema, table_name, and column_name accept search patterns ('%' to match zero or more characters and '_' to match a single character). diff --git a/reference/uodbc/functions/odbc-columns.xml b/reference/uodbc/functions/odbc-columns.xml index 94022590c8..d06dd007ae 100644 --- a/reference/uodbc/functions/odbc-columns.xml +++ b/reference/uodbc/functions/odbc-columns.xml @@ -10,7 +10,7 @@ resourceodbc_columns resourceconnection_id - stringqualifier + stringcatalog stringschema stringtable_name stringcolumn_name @@ -30,7 +30,7 @@ - qualifier + catalog The qualifier. diff --git a/reference/uodbc/functions/odbc-primarykeys.xml b/reference/uodbc/functions/odbc-primarykeys.xml index 6a9baddc08..5626ab832c 100644 --- a/reference/uodbc/functions/odbc-primarykeys.xml +++ b/reference/uodbc/functions/odbc-primarykeys.xml @@ -10,8 +10,8 @@ resourceodbc_primarykeys resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringtable @@ -30,14 +30,14 @@ - qualifier + catalog - owner + schema diff --git a/reference/uodbc/functions/odbc-procedurecolumns.xml b/reference/uodbc/functions/odbc-procedurecolumns.xml index ff871ce2c4..5d0d36fcfa 100644 --- a/reference/uodbc/functions/odbc-procedurecolumns.xml +++ b/reference/uodbc/functions/odbc-procedurecolumns.xml @@ -15,8 +15,8 @@ resourceodbc_procedurecolumns resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringproc stringcolumn @@ -36,7 +36,7 @@ - qualifier + catalog The qualifier. @@ -44,7 +44,7 @@ - owner + schema The owner. diff --git a/reference/uodbc/functions/odbc-procedures.xml b/reference/uodbc/functions/odbc-procedures.xml index dfc1f5c485..dde20895c6 100644 --- a/reference/uodbc/functions/odbc-procedures.xml +++ b/reference/uodbc/functions/odbc-procedures.xml @@ -15,8 +15,8 @@ resourceodbc_procedures resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringname @@ -35,7 +35,7 @@ - qualifier + catalog The qualifier. @@ -43,7 +43,7 @@ - owner + schema The owner. diff --git a/reference/uodbc/functions/odbc-specialcolumns.xml b/reference/uodbc/functions/odbc-specialcolumns.xml index 10f23bb6b2..af01ce4bb5 100644 --- a/reference/uodbc/functions/odbc-specialcolumns.xml +++ b/reference/uodbc/functions/odbc-specialcolumns.xml @@ -12,7 +12,7 @@ resourceodbc_specialcolumns resourceconnection_id inttype - stringqualifier + stringcatalog stringtable intscope intnullable @@ -51,7 +51,7 @@ - qualifier + catalog The qualifier. diff --git a/reference/uodbc/functions/odbc-statistics.xml b/reference/uodbc/functions/odbc-statistics.xml index e728211844..0ad165e162 100644 --- a/reference/uodbc/functions/odbc-statistics.xml +++ b/reference/uodbc/functions/odbc-statistics.xml @@ -11,8 +11,8 @@ resourceodbc_statistics resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringtable_name intunique intaccuracy @@ -33,7 +33,7 @@ - qualifier + catalog The qualifier. @@ -41,7 +41,7 @@ - owner + schema The owner. diff --git a/reference/uodbc/functions/odbc-tableprivileges.xml b/reference/uodbc/functions/odbc-tableprivileges.xml index 3e0cdb6363..da22c66bdb 100644 --- a/reference/uodbc/functions/odbc-tableprivileges.xml +++ b/reference/uodbc/functions/odbc-tableprivileges.xml @@ -11,8 +11,8 @@ resourceodbc_tableprivileges resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringname @@ -32,7 +32,7 @@ - qualifier + catalog The qualifier. @@ -40,7 +40,7 @@ - owner + schema The owner. Accepts the following search patterns: diff --git a/reference/uodbc/functions/odbc-tables.xml b/reference/uodbc/functions/odbc-tables.xml index e98814392d..7bbcf40be6 100644 --- a/reference/uodbc/functions/odbc-tables.xml +++ b/reference/uodbc/functions/odbc-tables.xml @@ -11,8 +11,8 @@ resourceodbc_tables resourceconnection_id - stringqualifier - stringowner + stringcatalog + stringschema stringname stringtypes @@ -22,14 +22,14 @@ To support enumeration of qualifiers, owners, and table types, the following special semantics for the - qualifier, owner, + catalog, schema, name, and table_type are available: - If qualifier is a single percent - character (%) and owner and + If catalog is a single percent + character (%) and schema and name are empty strings, then the result set contains a list of valid qualifiers for the data source. (All columns except the TABLE_QUALIFIER column contain @@ -38,8 +38,8 @@ - If owner is a single percent character - (%) and qualifier and + If schema is a single percent character + (%) and catalog and name are empty strings, then the result set contains a list of valid owners for the data source. (All columns except the TABLE_OWNER column contain @@ -49,8 +49,8 @@ If table_type is a single percent - character (%) and qualifier, - owner and name + character (%) and catalog, + schema and name are empty strings, then the result set contains a list of valid table types for the data source. (All columns except the TABLE_TYPE column contain NULLs.) @@ -71,7 +71,7 @@ - qualifier + catalog The qualifier. @@ -79,7 +79,7 @@ - owner + schema The owner. Accepts search patterns ('%' to match zero or more