Skip to content

Commit 575e372

Browse files
kocsismatekocsismate
committed
Fix UNKNOWN default values in ext/odbc
1 parent 23429b5 commit 575e372

File tree

3 files changed

+50
-71
lines changed

3 files changed

+50
-71
lines changed

‎ext/odbc/odbc.stub.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function odbc_longreadlen($result_id, int $length): bool {}
1717
function odbc_prepare($connection_id, string $query) {}
1818

1919
/** @param resource $result_id */
20-
function odbc_execute($result_id, array $parameters_array = UNKNOWN): bool {}
20+
function odbc_execute($result_id, array $parameters_array = []): bool {}
2121

2222
/** @param resource $result_id */
2323
function odbc_cursor($result_id): string|false {}
@@ -31,14 +31,14 @@ function odbc_data_source($connection_id, int $fetch_type): array|false {}
3131
* @param resource $connection_id
3232
* @return resource|false
3333
*/
34-
function odbc_exec($connection_id, string $query, int $flags = UNKNOWN) {}
34+
function odbc_exec($connection_id, string $query) {}
3535

3636
/**
3737
* @param resource $connection_id
3838
* @return resource|false
3939
* @alias odbc_exec
4040
*/
41-
function odbc_do($connection_id, string $query, int $flags = UNKNOWN) {}
41+
function odbc_do($connection_id, string $query) {}
4242

4343
#ifdef PHP_ODBC_HAVE_FETCH_HASH
4444
/** @param resource $result */
@@ -55,7 +55,7 @@ function odbc_fetch_array($result, int $rownumber = -1): array|false {}
5555
function odbc_fetch_into($result_id, &$result_array, int $rownumber = 0): int|false {}
5656

5757
/** @param resource $result_id */
58-
function odbc_fetch_row($result_id, int $row_number = UNKNOWN): bool {}
58+
function odbc_fetch_row($result_id, ?int $row_number = null): bool {}
5959

6060
/** @param resource $result_id */
6161
function odbc_result($result_id, string|int $field): string|bool|null {}
@@ -116,11 +116,11 @@ function odbc_commit($connection_id): bool {}
116116
/** @param resource $connection_id */
117117
function odbc_rollback($connection_id): bool {}
118118

119-
/** @param resource $connection_id */
120-
function odbc_error($connection_id = UNKNOWN): string {}
119+
/** @param resource|null $connection_id */
120+
function odbc_error($connection_id = null): string {}
121121

122-
/** @param resource $connection_id */
123-
function odbc_errormsg($connection_id = UNKNOWN): string {}
122+
/** @param resource|null $connection_id */
123+
function odbc_errormsg($connection_id = null): string {}
124124

125125
/** @param resource $conn_id */
126126
function odbc_setoption($conn_id, int $which, int $option, int $value): bool {}
@@ -129,13 +129,13 @@ function odbc_setoption($conn_id, int $which, int $option, int $value): bool {}
129129
* @param resource $connection_id
130130
* @return resource|false
131131
*/
132-
function odbc_tables($connection_id, ?string $qualfier = null, string $owner = UNKNOWN, string $name = UNKNOWN, string $table_types = UNKNOWN) {}
132+
function odbc_tables($connection_id, ?string $qualfier = null, ?string $owner = null, ?string $name = null, ?string $table_types = null) {}
133133

134134
/**
135135
* @param resource $connection_id
136136
* @return resource|false
137137
*/
138-
function odbc_columns($connection_id, ?string $qualifier = null, string $owner = UNKNOWN, string $table_name = UNKNOWN, string $column_name = UNKNOWN) {}
138+
function odbc_columns($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $table_name = null, ?string $column_name = null) {}
139139

140140
/**
141141
* @param resource $connection_id
@@ -154,13 +154,13 @@ function odbc_primarykeys($connection_id, ?string $qualifier, string $owner, str
154154
* @param resource $connection_id
155155
* @return resource|false
156156
*/
157-
function odbc_procedurecolumns($connection_id, ?string $qualifier = null, string $owner = UNKNOWN, string $proc = UNKNOWN, string $column = UNKNOWN) {}
157+
function odbc_procedurecolumns($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $proc = null, ?string $column = null) {}
158158

159159
/**
160160
* @param resource $connection_id
161161
* @return resource|false
162162
*/
163-
function odbc_procedures($connection_id, ?string $qualifier = null, string $owner = UNKNOWN, string $name = UNKNOWN) {}
163+
function odbc_procedures($connection_id, ?string $qualifier = null, ?string $owner = null, ?string $name = null) {}
164164

165165
/**
166166
* @param resource $connection_id

‎ext/odbc/odbc_arginfo.h‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 57db79b23d127851f985d9b6280b113637384a68 */
2+
* Stub hash: 58f541b70bbdd815d1a09ae81ba496e12493a713 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_close_all, 0, 0, IS_VOID, 0)
55
ZEND_END_ARG_INFO()
@@ -21,7 +21,7 @@ ZEND_END_ARG_INFO()
2121

2222
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_execute, 0, 1, _IS_BOOL, 0)
2323
ZEND_ARG_INFO(0, result_id)
24-
ZEND_ARG_TYPE_INFO(0, parameters_array, IS_ARRAY, 0)
24+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, parameters_array, IS_ARRAY, 0, "[]")
2525
ZEND_END_ARG_INFO()
2626

2727
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_cursor, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
@@ -35,13 +35,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_data_source, 0, 2, MAY_BE_A
3535
ZEND_END_ARG_INFO()
3636
#endif
3737

38-
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2)
39-
ZEND_ARG_INFO(0, connection_id)
40-
ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
41-
ZEND_ARG_TYPE_INFO(0, flags, IS_LONG, 0)
42-
ZEND_END_ARG_INFO()
38+
#define arginfo_odbc_exec arginfo_odbc_prepare
4339

44-
#define arginfo_odbc_do arginfo_odbc_exec
40+
#define arginfo_odbc_do arginfo_odbc_prepare
4541

4642
#if defined(PHP_ODBC_HAVE_FETCH_HASH)
4743
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_odbc_fetch_object, 0, 1, stdClass, MAY_BE_FALSE)
@@ -65,7 +61,7 @@ ZEND_END_ARG_INFO()
6561

6662
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_fetch_row, 0, 1, _IS_BOOL, 0)
6763
ZEND_ARG_INFO(0, result_id)
68-
ZEND_ARG_TYPE_INFO(0, row_number, IS_LONG, 0)
64+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, row_number, IS_LONG, 1, "null")
6965
ZEND_END_ARG_INFO()
7066

7167
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_odbc_result, 0, 2, MAY_BE_STRING|MAY_BE_BOOL|MAY_BE_NULL)
@@ -140,7 +136,7 @@ ZEND_END_ARG_INFO()
140136
#define arginfo_odbc_rollback arginfo_odbc_commit
141137

142138
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_error, 0, 0, IS_STRING, 0)
143-
ZEND_ARG_INFO(0, connection_id)
139+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, connection_id, "null")
144140
ZEND_END_ARG_INFO()
145141

146142
#define arginfo_odbc_errormsg arginfo_odbc_error
@@ -155,17 +151,17 @@ ZEND_END_ARG_INFO()
155151
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
156152
ZEND_ARG_INFO(0, connection_id)
157153
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualfier, IS_STRING, 1, "null")
158-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
159-
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
160-
ZEND_ARG_TYPE_INFO(0, table_types, IS_STRING, 0)
154+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
155+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
156+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table_types, IS_STRING, 1, "null")
161157
ZEND_END_ARG_INFO()
162158

163159
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
164160
ZEND_ARG_INFO(0, connection_id)
165161
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
166-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
167-
ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0)
168-
ZEND_ARG_TYPE_INFO(0, column_name, IS_STRING, 0)
162+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
163+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, table_name, IS_STRING, 1, "null")
164+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column_name, IS_STRING, 1, "null")
169165
ZEND_END_ARG_INFO()
170166

171167
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_gettypeinfo, 0, 0, 1)
@@ -184,18 +180,18 @@ ZEND_END_ARG_INFO()
184180
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
185181
ZEND_ARG_INFO(0, connection_id)
186182
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
187-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
188-
ZEND_ARG_TYPE_INFO(0, proc, IS_STRING, 0)
189-
ZEND_ARG_TYPE_INFO(0, column, IS_STRING, 0)
183+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
184+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, proc, IS_STRING, 1, "null")
185+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, column, IS_STRING, 1, "null")
190186
ZEND_END_ARG_INFO()
191187
#endif
192188

193189
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
194190
ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
195191
ZEND_ARG_INFO(0, connection_id)
196192
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifier, IS_STRING, 1, "null")
197-
ZEND_ARG_TYPE_INFO(0, owner, IS_STRING, 0)
198-
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
193+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, owner, IS_STRING, 1, "null")
194+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, name, IS_STRING, 1, "null")
199195
ZEND_END_ARG_INFO()
200196
#endif
201197

‎ext/odbc/php_odbc.c‎

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ PHP_FUNCTION(odbc_prepare)
964964
PHP_FUNCTION(odbc_execute)
965965
{
966966
zval *pv_res, *tmp;
967-
HashTable *pv_param_ht;
967+
HashTable *pv_param_ht = NULL;
968968
typedef struct params_t {
969969
SQLLEN vallen;
970970
int fp;
@@ -974,26 +974,20 @@ PHP_FUNCTION(odbc_execute)
974974
unsigned char otype;
975975
SQLSMALLINT ctype;
976976
odbc_result *result;
977-
int numArgs = ZEND_NUM_ARGS(), i, ne;
977+
int i, ne = 0;
978978
RETCODE rc;
979979

980-
if (zend_parse_parameters(numArgs, "r|h", &pv_res, &pv_param_ht) == FAILURE) {
980+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|h", &pv_res, &pv_param_ht) == FAILURE) {
981981
RETURN_THROWS();
982982
}
983983

984984
if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
985985
RETURN_THROWS();
986986
}
987987

988-
/* XXX check for already bound parameters*/
989-
if (result->numparams > 0 && numArgs == 1) {
990-
php_error_docref(NULL, E_WARNING, "No parameters to SQL statement given");
991-
RETURN_FALSE;
992-
}
993-
994988
if (result->numparams > 0) {
995-
if ((ne = zend_hash_num_elements(pv_param_ht)) < result->numparams) {
996-
php_error_docref(NULL, E_WARNING,"Not enough parameters (%d should be %d) given", ne, result->numparams);
989+
if (!pv_param_ht || (ne = zend_hash_num_elements(pv_param_ht)) < result->numparams) {
990+
php_error_docref(NULL, E_WARNING, "Not enough parameters (%d should be %d) given", ne, result->numparams);
997991
RETURN_FALSE;
998992
}
999993

@@ -1294,7 +1288,6 @@ PHP_FUNCTION(odbc_data_source)
12941288
PHP_FUNCTION(odbc_exec)
12951289
{
12961290
zval *pv_conn;
1297-
zend_long pv_flags;
12981291
char *query;
12991292
size_t query_len;
13001293
odbc_result *result = NULL;
@@ -1304,7 +1297,7 @@ PHP_FUNCTION(odbc_exec)
13041297
SQLUINTEGER scrollopts;
13051298
#endif
13061299

1307-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|l", &pv_conn, &query, &query_len, &pv_flags) == FAILURE) {
1300+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &pv_conn, &query, &query_len) == FAILURE) {
13081301
RETURN_THROWS();
13091302
}
13101303

@@ -1683,22 +1676,20 @@ PHP_FUNCTION(solid_fetch_prev)
16831676
/* {{{ Fetch a row */
16841677
PHP_FUNCTION(odbc_fetch_row)
16851678
{
1686-
SQLLEN rownum;
16871679
odbc_result *result;
16881680
RETCODE rc;
16891681
zval *pv_res;
1690-
zend_long pv_row = 1;
1682+
zend_bool pv_row;
1683+
zend_bool pv_row_is_null = 1;
16911684
#ifdef HAVE_SQL_EXTENDED_FETCH
16921685
SQLULEN crow;
16931686
SQLUSMALLINT RowStatus[1];
16941687
#endif
16951688

1696-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &pv_res, &pv_row) == FAILURE) {
1689+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l!", &pv_res, &pv_row, &pv_row_is_null) == FAILURE) {
16971690
RETURN_THROWS();
16981691
}
16991692

1700-
rownum = pv_row;
1701-
17021693
if ((result = (odbc_result *)zend_fetch_resource(Z_RES_P(pv_res), "ODBC result", le_result)) == NULL) {
17031694
RETURN_THROWS();
17041695
}
@@ -1710,8 +1701,8 @@ PHP_FUNCTION(odbc_fetch_row)
17101701

17111702
#ifdef HAVE_SQL_EXTENDED_FETCH
17121703
if (result->fetch_abs) {
1713-
if (ZEND_NUM_ARGS() > 1) {
1714-
rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus);
1704+
if (!pv_row_is_null) {
1705+
rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,(SQLLEN)pv_row,&crow,RowStatus);
17151706
} else {
17161707
rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
17171708
}
@@ -1723,8 +1714,8 @@ PHP_FUNCTION(odbc_fetch_row)
17231714
RETURN_FALSE;
17241715
}
17251716

1726-
if (ZEND_NUM_ARGS() > 1) {
1727-
result->fetched = rownum;
1717+
if (!pv_row_is_null) {
1718+
result->fetched = (SQLLEN)pv_row;
17281719
} else {
17291720
result->fetched++;
17301721
}
@@ -2645,14 +2636,14 @@ PHP_FUNCTION(odbc_rollback)
26452636
static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
26462637
{
26472638
odbc_connection *conn;
2648-
zval *pv_handle;
2639+
zval *pv_handle = NULL;
26492640
char *ret;
26502641

2651-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &pv_handle) == FAILURE) {
2642+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &pv_handle) == FAILURE) {
26522643
RETURN_THROWS();
26532644
}
26542645

2655-
if (ZEND_NUM_ARGS() == 1) {
2646+
if (pv_handle) {
26562647
if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(pv_handle), "ODBC-Link", le_conn, le_pconn))) {
26572648
RETURN_THROWS();
26582649
}
@@ -2757,7 +2748,7 @@ PHP_FUNCTION(odbc_tables)
27572748
size_t cat_len = 0, schema_len = 0, table_len = 0, type_len = 0;
27582749
RETCODE rc;
27592750

2760-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len,
2751+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!s!", &pv_conn, &cat, &cat_len, &schema, &schema_len,
27612752
&table, &table_len, &type, &type_len) == FAILURE) {
27622753
RETURN_THROWS();
27632754
}
@@ -2782,7 +2773,7 @@ PHP_FUNCTION(odbc_tables)
27822773
}
27832774

27842775
/* This hack is needed to access table information in Access databases (fmk) */
2785-
if (table && table_len && schema && schema_len == 0) {
2776+
if (schema && schema_len == 0 && table && table_len) {
27862777
schema = NULL;
27872778
}
27882779

@@ -2825,7 +2816,7 @@ PHP_FUNCTION(odbc_columns)
28252816
size_t cat_len = 0, schema_len = 0, table_len = 0, column_len = 0;
28262817
RETCODE rc;
28272818

2828-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len,
2819+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!s!", &pv_conn, &cat, &cat_len, &schema, &schema_len,
28292820
&table, &table_len, &column, &column_len) == FAILURE) {
28302821
RETURN_THROWS();
28312822
}
@@ -3161,11 +3152,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
31613152
size_t cat_len = 0, schema_len = 0, proc_len = 0, col_len = 0;
31623153
RETCODE rc;
31633154

3164-
if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 5) {
3165-
WRONG_PARAM_COUNT;
3166-
}
3167-
3168-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len,
3155+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!s!", &pv_conn, &cat, &cat_len, &schema, &schema_len,
31693156
&proc, &proc_len, &col, &col_len) == FAILURE) {
31703157
RETURN_THROWS();
31713158
}
@@ -3230,11 +3217,7 @@ PHP_FUNCTION(odbc_procedures)
32303217
size_t cat_len = 0, schema_len = 0, proc_len = 0;
32313218
RETCODE rc;
32323219

3233-
if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 4) {
3234-
WRONG_PARAM_COUNT;
3235-
}
3236-
3237-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!ss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &proc, &proc_len) == FAILURE) {
3220+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!", &pv_conn, &cat, &cat_len, &schema, &schema_len, &proc, &proc_len) == FAILURE) {
32383221
RETURN_THROWS();
32393222
}
32403223

0 commit comments

Comments
 (0)