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.

diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php
index 5abf8d5d5bc6952efdd45d3f0282485d7579b028..667d5e88b76a223b5c85fd1ba6d8f9d1c07976ff 100644 (file)
--- 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

diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h
index bcc52bdacce01e414db25912ec05bc8cad68719b..ad2fbf48b02a445efac7f6d1062a4e8191d61cdd 100644 (file)
--- a/ext/odbc/odbc_arginfo.h
+++ b/ext/odbc/odbc_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3e7073410f7d9d8357f2eeacd0457567901dbe08 */
+ * Stub hash: 53069f42e460cfea8e2daf499277f6ceb9c760f7 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -150,16 +150,16 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualfier, IS_STRING, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table_types, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table_name, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column_name, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -171,16 +171,16 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
-       ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
+       ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, proc, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
@@ -189,8 +189,8 @@ ZEND_END_ARG_INFO()
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, catalog, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, schema, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
@@ -198,11 +198,11 @@ ZEND_END_ARG_INFO()
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO(0, pk_qualifier, IS_STRING, 1)
-       ZEND_ARG_TYPE_INFO(0, pk_owner, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, pk_catalog, IS_STRING, 1)
+       ZEND_ARG_TYPE_INFO(0, pk_schema, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, pk_table, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, fk_qualifier, IS_STRING, 0)
-       ZEND_ARG_TYPE_INFO(0, fk_owner, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, fk_catalog, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, fk_schema, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, fk_table, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -210,8 +210,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
-       ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
-       ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
+       ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, table, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, scope, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, nullable, IS_LONG, 0)
@@ -219,8 +219,8 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO(0, qualfier, IS_STRING, 1)
-       ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
+       ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, unique, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, accuracy, IS_LONG, 0)
@@ -229,8 +229,8 @@ ZEND_END_ARG_INFO()
 #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4)
        ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO(0, qualifier, IS_STRING, 1)
-       ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
+       ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
+       ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif