archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix ODBC test which may not properly clean up
This commit is contained in:
Christoph M. Becker 2022-01-07 19:25:23 +01:00
commit 0a9f552911
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/odbc/tests/odbc_exec_002.phpt
View file

@ -23,11 +23,13 @@ $res = odbc_exec($conn, 'SELECT * FROM FOO');
var_dump(odbc_fetch_row($res)); var_dump(odbc_fetch_row($res));
var_dump(odbc_result($res, 'test')); var_dump(odbc_result($res, 'test'));
var_dump(odbc_fetch_array($res)); var_dump(odbc_fetch_array($res));
?>
--CLEAN--
<?php
require 'config.inc';
$conn = odbc_connect($dsn, $user, $pass);
odbc_exec($conn, 'DROP TABLE FOO'); odbc_exec($conn, 'DROP TABLE FOO');
odbc_exec($conn, 'DROP DATABASE odbcTEST'); odbc_exec($conn, 'DROP DATABASE odbcTEST');
?> ?>
--EXPECT-- --EXPECT--
bool(true) bool(true)

8
ext/odbc/tests/odbc_free_result_001.phpt
View file

@ -39,11 +39,13 @@ try {
} catch (TypeError $e) { } catch (TypeError $e) {
echo $e->getMessage(), "\n"; echo $e->getMessage(), "\n";
} }
?>
--CLEAN--
<?php
require 'config.inc';
$conn = odbc_connect($dsn, $user, $pass);
odbc_exec($conn, 'DROP TABLE FOO'); odbc_exec($conn, 'DROP TABLE FOO');
odbc_exec($conn, 'DROP DATABASE odbcTEST'); odbc_exec($conn, 'DROP DATABASE odbcTEST');
?> ?>
--EXPECT-- --EXPECT--
bool(true) bool(true)