mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix ODBC test which may not properly clean up
This commit is contained in:
commit
0a9f552911
2 changed files with 10 additions and 6 deletions
|
@ -23,11 +23,13 @@ $res = odbc_exec($conn, 'SELECT * FROM FOO');
|
|||
var_dump(odbc_fetch_row($res));
|
||||
var_dump(odbc_result($res, 'test'));
|
||||
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 DATABASE odbcTEST');
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
bool(true)
|
||||
|
|
|
@ -39,11 +39,13 @@ try {
|
|||
} catch (TypeError $e) {
|
||||
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 DATABASE odbcTEST');
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
bool(true)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue