Skip to content

Commit 0c32152

Browse files
VincentLangletondrejmirtes
authored andcommitted
Fix odbc definitions
1 parent ba27b70 commit 0c32152

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

resources/functionMap.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7889,13 +7889,13 @@
78897889
'odbc_binmode' => ['bool', 'result_id'=>'int', 'mode'=>'int'],
78907890
'odbc_close' => ['void', 'connection_id'=>'resource'],
78917891
'odbc_close_all' => ['void'],
7892-
'odbc_columnprivileges' => ['resource', 'connection_id'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string', 'column'=>'string'],
7893-
'odbc_columns' => ['resource', 'connection_id'=>'resource', 'qualifier='=>'string', 'owner='=>'string', 'table_name='=>'string', 'column_name='=>'string'],
7892+
'odbc_columnprivileges' => ['resource|false', 'connection_id'=>'resource', 'catalog'=>'string', 'schema'=>'string', 'table'=>'string', 'column'=>'string'],
7893+
'odbc_columns' => ['resource|false', 'connection_id'=>'resource', 'qualifier='=>'string', 'owner='=>'string', 'table_name='=>'string', 'column_name='=>'string'],
78947894
'odbc_commit' => ['bool', 'connection_id'=>'resource'],
78957895
'odbc_connect' => ['resource|false', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
78967896
'odbc_cursor' => ['string|false', 'result_id'=>'resource'],
78977897
'odbc_data_source' => ['array|false', 'connection_id'=>'resource', 'fetch_type'=>'int'],
7898-
'odbc_do' => ['resource', 'connection_id'=>'resource', 'query'=>'string', 'flags='=>'int'],
7898+
'odbc_do' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string', 'flags='=>'int'],
78997899
'odbc_error' => ['string', 'connection_id='=>'resource'],
79007900
'odbc_errormsg' => ['string', 'connection_id='=>'resource'],
79017901
'odbc_exec' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string', 'flags='=>'int'],
@@ -7910,26 +7910,26 @@
79107910
'odbc_field_precision' => ['int|false', 'result_id'=>'resource', 'field_number'=>'int'],
79117911
'odbc_field_scale' => ['int|false', 'result_id'=>'resource', 'field_number'=>'int'],
79127912
'odbc_field_type' => ['string|false', 'result_id'=>'resource', 'field_number'=>'int'],
7913-
'odbc_foreignkeys' => ['resource', 'connection_id'=>'resource', 'pk_qualifier'=>'string', 'pk_owner'=>'string', 'pk_table'=>'string', 'fk_qualifier'=>'string', 'fk_owner'=>'string', 'fk_table'=>'string'],
7913+
'odbc_foreignkeys' => ['resource|false', 'connection_id'=>'resource', 'pk_qualifier'=>'string', 'pk_owner'=>'string', 'pk_table'=>'string', 'fk_qualifier'=>'string', 'fk_owner'=>'string', 'fk_table'=>'string'],
79147914
'odbc_free_result' => ['bool', 'result_id'=>'resource'],
7915-
'odbc_gettypeinfo' => ['resource', 'connection_id'=>'resource', 'data_type='=>'int'],
7915+
'odbc_gettypeinfo' => ['resource|false', 'connection_id'=>'resource', 'data_type='=>'int'],
79167916
'odbc_longreadlen' => ['bool', 'result_id'=>'resource', 'length'=>'int'],
79177917
'odbc_next_result' => ['bool', 'result_id'=>'resource'],
79187918
'odbc_num_fields' => ['int', 'result_id'=>'resource'],
79197919
'odbc_num_rows' => ['int', 'result_id'=>'resource'],
7920-
'odbc_pconnect' => ['resource', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
7920+
'odbc_pconnect' => ['resource|false', 'dsn'=>'string', 'user'=>'string', 'password'=>'string', 'cursor_option='=>'int'],
79217921
'odbc_prepare' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string'],
7922-
'odbc_primarykeys' => ['resource', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'table'=>'string'],
7923-
'odbc_procedurecolumns' => ['resource', 'connection_id'=>'', 'qualifier'=>'string', 'owner'=>'string', 'proc'=>'string', 'column'=>'string'],
7924-
'odbc_procedures' => ['resource', 'connection_id'=>'', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string'],
7922+
'odbc_primarykeys' => ['resource|false', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'table'=>'string'],
7923+
'odbc_procedurecolumns' => ['resource|false', 'connection_id'=>'', 'qualifier'=>'string', 'owner'=>'string', 'proc'=>'string', 'column'=>'string'],
7924+
'odbc_procedures' => ['resource|false', 'connection_id'=>'', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string'],
79257925
'odbc_result' => ['mixed', 'result_id'=>'resource', 'field'=>'mixed'],
79267926
'odbc_result_all' => ['int|false', 'result_id'=>'resource', 'format='=>'string'],
79277927
'odbc_rollback' => ['bool', 'connection_id'=>'resource'],
79287928
'odbc_setoption' => ['bool', 'result_id'=>'resource', 'which'=>'int', 'option'=>'int', 'value'=>'int'],
7929-
'odbc_specialcolumns' => ['resource', 'connection_id'=>'resource', 'type'=>'int', 'qualifier'=>'string', 'owner'=>'string', 'table'=>'string', 'scope'=>'int', 'nullable'=>'int'],
7930-
'odbc_statistics' => ['resource', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string', 'unique'=>'int', 'accuracy'=>'int'],
7931-
'odbc_tableprivileges' => ['resource', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string'],
7932-
'odbc_tables' => ['resource', 'connection_id'=>'resource', 'qualifier='=>'string', 'owner='=>'string', 'name='=>'string', 'table_types='=>'string'],
7929+
'odbc_specialcolumns' => ['resource|false', 'connection_id'=>'resource', 'type'=>'int', 'qualifier'=>'string', 'owner'=>'string', 'table'=>'string', 'scope'=>'int', 'nullable'=>'int'],
7930+
'odbc_statistics' => ['resource|false', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string', 'unique'=>'int', 'accuracy'=>'int'],
7931+
'odbc_tableprivileges' => ['resource|false', 'connection_id'=>'resource', 'qualifier'=>'string', 'owner'=>'string', 'name'=>'string'],
7932+
'odbc_tables' => ['resource|false', 'connection_id'=>'resource', 'qualifier='=>'string', 'owner='=>'string', 'name='=>'string', 'table_types='=>'string'],
79337933
'opcache_compile_file' => ['bool', 'file'=>'string'],
79347934
'opcache_get_configuration' => ['array|false'],
79357935
'opcache_get_status' => ['array|false', 'get_scripts='=>'bool'],

resources/functionMap_php80delta.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
'mb_strlen' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'],
9494
'mktime' => ['int|false', 'hour'=>'int', 'minute='=>'int', 'second='=>'int', 'month='=>'int', 'day='=>'int', 'year='=>'int'],
9595
'odbc_exec' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string'],
96+
'odbc_do' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string'],
9697
'parse_str' => ['void', 'encoded_string'=>'string', '&w_result'=>'array'],
9798
'password_hash' => ['non-empty-string', 'password'=>'string', 'algo'=>'string|int|null', 'options='=>'array'],
9899
'PDOStatement::fetchAll' => ['array', 'how='=>'int', 'fetch_argument='=>'int|string|callable', 'ctor_args='=>'?array'],

0 commit comments

Comments
 (0)