Skip to content

Commit 66232da

Browse files
committed
Fix compiler error on Win an improve error message
1 parent d54134d commit 66232da

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/odbc/php_odbc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1247,8 +1247,8 @@ PHP_FUNCTION(odbc_data_source)
12471247
fetch_type = (SQLSMALLINT) zv_fetch_type;
12481248

12491249
if (!(fetch_type == SQL_FETCH_FIRST || fetch_type == SQL_FETCH_NEXT)) {
1250-
zend_argument_value_error(2, "must be SQL_FETCH_FIRST or SQL_FETCH_NEXT");
1251-
RETURN_THROWS()
1250+
zend_argument_value_error(2, "must either be SQL_FETCH_FIRST or SQL_FETCH_NEXT");
1251+
RETURN_THROWS();
12521252
}
12531253

12541254
if (!(conn = (odbc_connection *)zend_fetch_resource2(Z_RES_P(zv_conn), "ODBC-Link", le_conn, le_pconn))) {

ext/odbc/tests/odbc_data_source_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var_dump(odbc_data_source($conn, SQL_FETCH_FIRST));
2323

2424
?>
2525
--EXPECTF--
26-
odbc_data_source(): Argument #2 ($fetch_type) must be SQL_FETCH_FIRST or SQL_FETCH_NEXT
26+
odbc_data_source(): Argument #2 ($fetch_type) must either be SQL_FETCH_FIRST or SQL_FETCH_NEXT
2727
bool(false)
2828
array(%d) {
2929
%a

0 commit comments

Comments
 (0)