diff options
| author | Anatol Belski <ab@php.net> | 2017-12-20 18:50:10 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-12-20 18:50:10 +0100 |
| commit | dcc3f00090fc750f17aed4bf5ab4099bc91de75a (patch) | |
| tree | 7120c437053f93f423c508b746ff6157218a123e /ext | |
| parent | ac4da9a0ede87a437bc75f6135e103e2d3747b09 (diff) | |
| parent | c2308d5d7cb281b2e2b36774bbc4863429fab0bc (diff) | |
| download | php-git-dcc3f00090fc750f17aed4bf5ab4099bc91de75a.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Templatize driver name in the expected string
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/odbc/tests/bug73448.phpt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/odbc/tests/bug73448.phpt b/ext/odbc/tests/bug73448.phpt index 4becce7e7b..5f0be913f2 100644 --- a/ext/odbc/tests/bug73448.phpt +++ b/ext/odbc/tests/bug73448.phpt @@ -25,7 +25,7 @@ foreach ($sqlCommandList as $exampleNumber => $sql) { $e = odbc_errormsg($conn); $n = odbc_error($conn); - var_dump($sql, $n, $e, strlen($e)); + var_dump($sql, $n, $e); echo "\n"; } @@ -38,15 +38,13 @@ foreach ($sqlCommandList as $exampleNumber => $sql) { odbc_close($conn); ?> ==DONE== ---EXPECT-- +--EXPECTF-- string(42) "/* non existent procedure xy */ execute xy" string(5) "37000" -string(84) "[Microsoft][ODBC SQL Server Driver][SQL Server]Could not find stored procedure 'xy'." -int(84) +string(%d) "[Microsoft][%s][SQL Server]Could not find stored procedure 'xy'." string(58) "/* another erroneous query */ SELECT * FROM zwiebelfleisch" string(5) "S0002" -string(84) "[Microsoft][ODBC SQL Server Driver][SQL Server]Invalid object name 'zwiebelfleisch'." -int(84) +string(%d) "[Microsoft][%s][SQL Server]Invalid object name 'zwiebelfleisch'." ==DONE== |