Update ext/odbc parameter names

Closes GH-6303.

diff --git a/ext/odbc/odbc.stub.php b/ext/odbc/odbc.stub.php
index a20e22fa3209ea6837d5c0f090d354f2e01e039e..e241022e1049c59b245eac6fa568235444929537 100644 (file)
--- a/ext/odbc/odbc.stub.php
+++ b/ext/odbc/odbc.stub.php
@@ -4,67 +4,67 @@
 
 function odbc_close_all(): void {}
 
-/** @param resource $result_id */
-function odbc_binmode($result_id, int $mode): bool {}
+/** @param resource $statement */
+function odbc_binmode($statement, int $mode): bool {}
 
-/** @param resource $result_id */
-function odbc_longreadlen($result_id, int $length): bool {}
+/** @param resource $statement */
+function odbc_longreadlen($statement, int $length): bool {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_prepare($connection_id, string $query) {}
+function odbc_prepare($odbc, string $query) {}
 
-/** @param resource $result_id */
-function odbc_execute($result_id, array $parameters_array = []): bool {}
+/** @param resource $statement */
+function odbc_execute($statement, array $params = []): bool {}
 
-/** @param resource $result_id */
-function odbc_cursor($result_id): string|false {}
+/** @param resource $statement */
+function odbc_cursor($statement): string|false {}
 
 #ifdef HAVE_SQLDATASOURCES
-/** @param resource $connection_id */
-function odbc_data_source($connection_id, int $fetch_type): array|false {}
+/** @param resource $odbc */
+function odbc_data_source($odbc, int $fetch_type): array|false {}
 #endif
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_exec($connection_id, string $query) {}
+function odbc_exec($odbc, string $query) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  * @alias odbc_exec
  */
-function odbc_do($connection_id, string $query) {}
+function odbc_do($odbc, string $query) {}
 
 #ifdef PHP_ODBC_HAVE_FETCH_HASH
-/** @param resource $result */
-function odbc_fetch_object($result, int $rownumber = -1): stdClass|false {}
+/** @param resource $statement */
+function odbc_fetch_object($statement, int $row = -1): stdClass|false {}
 
-/** @param resource $result */
-function odbc_fetch_array($result, int $rownumber = -1): array|false {}
+/** @param resource $statement */
+function odbc_fetch_array($statement, int $row = -1): array|false {}
 #endif
 
 /**
- * @param resource $result_id
- * @param array $result_array
+ * @param resource $statement
+ * @param array $array
  */
-function odbc_fetch_into($result_id, &$result_array, int $rownumber = 0): int|false {}
+function odbc_fetch_into($statement, &$array, int $row = 0): int|false {}
 
-/** @param resource $result_id */
-function odbc_fetch_row($result_id, ?int $row_number = null): bool {}
+/** @param resource $statement */
+function odbc_fetch_row($statement, ?int $row = null): bool {}
 
-/** @param resource $result_id */
-function odbc_result($result_id, string|int $field): string|bool|null {}
+/** @param resource $statement */
+function odbc_result($statement, string|int $field): string|bool|null {}
 
-/** @param resource $result_id */
-function odbc_result_all($result_id, string $format = ""): int|false {}
+/** @param resource $statement */
+function odbc_result_all($statement, string $format = ""): int|false {}
 
-/** @param resource $result_id */
-function odbc_free_result($result_id): bool {}
+/** @param resource $statement */
+function odbc_free_result($statement): bool {}
 
 /** @return resource|false */
 function odbc_connect(string $dsn, string $user, string $password, int $cursor_option = SQL_CUR_USE_DRIVER) {}
@@ -72,125 +72,125 @@ function odbc_connect(string $dsn, string $user, string $password, int $cursor_o
 /** @return resource|false */
 function odbc_pconnect(string $dsn, string $user, string $password, int $cursor_option = SQL_CUR_USE_DRIVER) {}
 
-/** @param resource $connection_id */
-function odbc_close($connection_id): void {}
+/** @param resource $odbc */
+function odbc_close($odbc): void {}
 
-/** @param resource $result_id */
-function odbc_num_rows($result_id): int {}
+/** @param resource $statement */
+function odbc_num_rows($statement): int {}
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
-/** @param resource $result_id */
-function odbc_next_result($result_id): bool {}
+/** @param resource $statement */
+function odbc_next_result($statement): bool {}
 #endif
 
-/** @param resource $result_id */
-function odbc_num_fields($result_id): int {}
+/** @param resource $statement */
+function odbc_num_fields($statement): int {}
 
-/** @param resource $result_id */
-function odbc_field_name($result_id, int $field_number): string|false {}
+/** @param resource $statement */
+function odbc_field_name($statement, int $field): string|false {}
 
-/** @param resource $result_id */
-function odbc_field_type($result_id, int $field_number): string|false {}
+/** @param resource $statement */
+function odbc_field_type($statement, int $field): string|false {}
 
-/** @param resource $result_id */
-function odbc_field_len($result_id, int $field_number): int|false {}
+/** @param resource $statement */
+function odbc_field_len($statement, int $field): int|false {}
 
 /**
- * @param resource $result_id
+ * @param resource $statement
  * @alias odbc_field_len
  */
-function odbc_field_precision($result_id, int $field_number): int|false {}
+function odbc_field_precision($statement, int $field): int|false {}
 
-/** @param resource $result_id */
-function odbc_field_scale($result_id, int $field_number): int|false {}
+/** @param resource $statement */
+function odbc_field_scale($statement, int $field): int|false {}
 
-/** @param resource $result_id */
-function odbc_field_num($result_id, string $field_name): int|false {}
+/** @param resource $statement */
+function odbc_field_num($statement, string $field): int|false {}
 
-/** @param resource $connection_id */
-function odbc_autocommit($connection_id, bool $onoff = false): int|bool {}
+/** @param resource $odbc */
+function odbc_autocommit($odbc, bool $enable = false): int|bool {}
 
-/** @param resource $connection_id */
-function odbc_commit($connection_id): bool {}
+/** @param resource $odbc */
+function odbc_commit($odbc): bool {}
 
-/** @param resource $connection_id */
-function odbc_rollback($connection_id): bool {}
+/** @param resource $odbc */
+function odbc_rollback($odbc): bool {}
 
-/** @param resource|null $connection_id */
-function odbc_error($connection_id = null): string {}
+/** @param resource|null $odbc */
+function odbc_error($odbc = null): string {}
 
-/** @param resource|null $connection_id */
-function odbc_errormsg($connection_id = null): string {}
+/** @param resource|null $odbc */
+function odbc_errormsg($odbc = null): string {}
 
-/** @param resource $conn_id */
-function odbc_setoption($conn_id, int $which, int $option, int $value): bool {}
+/** @param resource $odbc */
+function odbc_setoption($odbc, int $which, int $option, int $value): bool {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_tables($connection_id, ?string $catalog = null, ?string $schema = null, ?string $name = null, ?string $table_types = null) {}
+function odbc_tables($odbc, ?string $catalog = null, ?string $schema = null, ?string $table = null, ?string $types = null) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_columns($connection_id, ?string $catalog = null, ?string $schema = null, ?string $table_name = null, ?string $column_name = null) {}
+function odbc_columns($odbc, ?string $catalog = null, ?string $schema = null, ?string $table = null, ?string $column = null) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_gettypeinfo($connection_id, int $data_type = 0) {}
+function odbc_gettypeinfo($odbc, int $data_type = 0) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_primarykeys($connection_id, ?string $catalog, string $schema, string $table) {}
+function odbc_primarykeys($odbc, ?string $catalog, string $schema, string $table) {}
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_procedurecolumns($connection_id, ?string $catalog = null, ?string $schema = null, ?string $proc = null, ?string $column = null) {}
+function odbc_procedurecolumns($odbc, ?string $catalog = null, ?string $schema = null, ?string $procedure = null, ?string $column = null) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_procedures($connection_id, ?string $catalog = null, ?string $schema = null, ?string $name = null) {}
+function odbc_procedures($odbc, ?string $catalog = null, ?string $schema = null, ?string $procedure = null) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_foreignkeys($connection_id, ?string $pk_catalog, string $pk_schema, string $pk_table, string $fk_catalog, string $fk_schema, string $fk_table) {}
+function odbc_foreignkeys($odbc, ?string $pk_catalog, string $pk_schema, string $pk_table, string $fk_catalog, string $fk_schema, string $fk_table) {}
 #endif
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_specialcolumns($connection_id, int $type, ?string $catalog, string $schema, string $table, int $scope, int $nullable) {}
+function odbc_specialcolumns($odbc, int $type, ?string $catalog, string $schema, string $table, int $scope, int $nullable) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_statistics($connection_id, ?string $catalog, string $schema, string $name, int $unique, int $accuracy) {}
+function odbc_statistics($odbc, ?string $catalog, string $schema, string $table, int $unique, int $accuracy) {}
 
 #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_tableprivileges($connection_id, ?string $catalog, string $schema, string $name) {}
+function odbc_tableprivileges($odbc, ?string $catalog, string $schema, string $table) {}
 
 /**
- * @param resource $connection_id
+ * @param resource $odbc
  * @return resource|false
  */
-function odbc_columnprivileges($connection_id, ?string $catalog, string $schema, string $table, string $column) {}
+function odbc_columnprivileges($odbc, ?string $catalog, string $schema, string $table, string $column) {}
 #endif

diff --git a/ext/odbc/odbc_arginfo.h b/ext/odbc/odbc_arginfo.h
index 361c93c5eb648eca2a5bb02fae0e61ae240e3363..974edf32f082472916454367365f43612b1858c4 100644 (file)
--- a/ext/odbc/odbc_arginfo.h
+++ b/ext/odbc/odbc_arginfo.h
@@ -1,36 +1,36 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: bdf94bcc0fd30c5b08aa80ecc6c2ff8ca6de3e62 */
+ * Stub hash: dd2205269dd48e1af19c3980291b21d86fa11a93 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_binmode, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
        ZEND_ARG_TYPE_INFO(0, mode, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_longreadlen, 0, 2, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
        ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_prepare, 0, 0, 2)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_execute, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, result_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, parameters_array, IS_ARRAY, 0, "[]")
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, params, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_cursor, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_SQLDATASOURCES)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_data_source, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        ZEND_ARG_TYPE_INFO(0, fetch_type, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -41,41 +41,41 @@ ZEND_END_ARG_INFO()
 
 #if defined(PHP_ODBC_HAVE_FETCH_HASH)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_odbc_fetch_object, 0, 1, stdClass, MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rownumber, IS_LONG, 0, "-1")
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(PHP_ODBC_HAVE_FETCH_HASH)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_fetch_array, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rownumber, IS_LONG, 0, "-1")
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 0, "-1")
 ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_fetch_into, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result_id)
-       ZEND_ARG_INFO(1, result_array)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, rownumber, IS_LONG, 0, "0")
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_INFO(1, array)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_fetch_row, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, result_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row_number, IS_LONG, 1, "null")
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result, 0, 2, MAY_BE_STRING|MAY_BE_BOOL|MAY_BE_NULL)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
        ZEND_ARG_TYPE_MASK(0, field, MAY_BE_STRING|MAY_BE_LONG, NULL)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result_all, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, format, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_free_result, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3)
@@ -88,31 +88,31 @@ ZEND_END_ARG_INFO()
 #define arginfo_odbc_pconnect arginfo_odbc_connect
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close, 0, 1, IS_VOID, 0)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_num_rows, 0, 1, IS_LONG, 0)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_next_result, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, result_id)
+       ZEND_ARG_INFO(0, statement)
 ZEND_END_ARG_INFO()
 #endif
 
 #define arginfo_odbc_num_fields arginfo_odbc_num_rows
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_field_name, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result_id)
-       ZEND_ARG_TYPE_INFO(0, field_number, IS_LONG, 0)
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_odbc_field_type arginfo_odbc_field_name
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_field_len, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result_id)
-       ZEND_ARG_TYPE_INFO(0, field_number, IS_LONG, 0)
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO(0, field, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_odbc_field_precision arginfo_odbc_field_len
@@ -120,57 +120,57 @@ ZEND_END_ARG_INFO()
 #define arginfo_odbc_field_scale arginfo_odbc_field_len
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_field_num, 0, 2, MAY_BE_LONG|MAY_BE_FALSE)
-       ZEND_ARG_INFO(0, result_id)
-       ZEND_ARG_TYPE_INFO(0, field_name, IS_STRING, 0)
+       ZEND_ARG_INFO(0, statement)
+       ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_autocommit, 0, 1, MAY_BE_LONG|MAY_BE_BOOL)
-       ZEND_ARG_INFO(0, connection_id)
-       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, onoff, _IS_BOOL, 0, "false")
+       ZEND_ARG_INFO(0, odbc)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_commit, 0, 1, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
 ZEND_END_ARG_INFO()
 
 #define arginfo_odbc_rollback arginfo_odbc_commit
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_error, 0, 0, IS_STRING, 0)
-       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection_id, "null")
+       ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, odbc, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_odbc_errormsg arginfo_odbc_error
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_setoption, 0, 4, _IS_BOOL, 0)
-       ZEND_ARG_INFO(0, conn_id)
+       ZEND_ARG_INFO(0, odbc)
        ZEND_ARG_TYPE_INFO(0, which, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, value, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        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_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, 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_INFO(0, odbc)
        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_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table, IS_STRING, 1, "null")
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_gettypeinfo, 0, 0, 1)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, data_type, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        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)
@@ -178,26 +178,26 @@ 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_INFO(0, odbc)
        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, procedure, IS_STRING, 1, "null")
        ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #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_INFO(0, odbc)
        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, procedure, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 
 #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_INFO(0, odbc)
        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)
@@ -208,7 +208,7 @@ ZEND_END_ARG_INFO()
 #endif
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        ZEND_ARG_TYPE_INFO(0, type, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, catalog, IS_STRING, 1)
        ZEND_ARG_TYPE_INFO(0, schema, IS_STRING, 0)
@@ -218,26 +218,26 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        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, table, IS_STRING, 0)
        ZEND_ARG_TYPE_INFO(0, unique, IS_LONG, 0)
        ZEND_ARG_TYPE_INFO(0, accuracy, IS_LONG, 0)
 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_INFO(0, odbc)
        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, table, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columnprivileges, 0, 0, 5)
-       ZEND_ARG_INFO(0, connection_id)
+       ZEND_ARG_INFO(0, odbc)
        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)