Rename $qualifier/$owner params to $catalog/$schema

These have been called qualifier and owner with ODBC 2, but ODBC 3
changed that to catalog and schema, respectively.

Closes GH-6210.

1 files changed, 9 insertions, 9 deletions

diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php
index 5abf8d5d5b..667d5e88b7 100644
--- a/ext/odbc/odbc.stub.php
+++ b/ext/odbc/odbc.stub.php
@@ -129,13 +129,13 @@ function odbc_setoption($conn_id, int $which, int $option, int $value): bool {}
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_tables($connection_id, ?string $qualfier = null, ?string $owner = null, ?string $name = null, ?string $table_types = null) {}
+function odbc_tables($connection_id, ?string $catalog = null, ?string $schema = null, ?string $name = null, ?string $table_types = null) {}
 
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_columns($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $table_name = null, ?string $column_name = null) {}
+function odbc_columns($connection_id, ?string $catalog = null, ?string $schema = null, ?string $table_name = null, ?string $column_name = null) {}
 
 /**
  * @param resource $connection_id
@@ -147,46 +147,46 @@ function odbc_gettypeinfo($connection_id, int $data_type = 0) {}
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_primarykeys($connection_id, ?string $qualifier, string $owner, string $table) {}
+function odbc_primarykeys($connection_id, ?string $catalog, string $schema, string $table) {}
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_procedurecolumns($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $proc = null, ?string $column = null) {}
+function odbc_procedurecolumns($connection_id, ?string $catalog = null, ?string $schema = null, ?string $proc = null, ?string $column = null) {}
 
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_procedures($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $name = null) {}
+function odbc_procedures($connection_id, ?string $catalog = null, ?string $schema = null, ?string $name = null) {}
 
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_foreignkeys($connection_id, ?string $pk_qualifier, string $pk_owner, string $pk_table, string $fk_qualifier, string $fk_owner, string $fk_table) {}
+function odbc_foreignkeys($connection_id, ?string $pk_catalog, string $pk_schema, string $pk_table, string $fk_catalog, string $fk_schema, string $fk_table) {}
 #endif
 
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_specialcolumns($connection_id, int $type, ?string $qualifier, string $owner, string $table, int $scope, int $nullable) {}
+function odbc_specialcolumns($connection_id, int $type, ?string $catalog, string $schema, string $table, int $scope, int $nullable) {}
 
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_statistics($connection_id, ?string $qualfier, string $owner, string $name, int $unique, int $accuracy) {}
+function odbc_statistics($connection_id, ?string $catalog, string $schema, string $name, int $unique, int $accuracy) {}
 
 #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
 /**
  * @param resource $connection_id
  * @return resource|false
  */
-function odbc_tableprivileges($connection_id, ?string $qualifier, string $owner, string $name) {}
+function odbc_tableprivileges($connection_id, ?string $catalog, string $schema, string $name) {}
 
 /**
  * @param resource $connection_id