Skip to content

Commit c44f79b

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix phpGH-11492: Make test failure: ext/pdo_sqlite/tests/bug_42589.phpt
2 parents 1b53605 + 039dd0b commit c44f79b

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ PHP NEWS
55
- PCRE:
66
. Mangle PCRE regex cache key with JIT option. (mvorisek)
77

8+
- PDO SQLite:
9+
. Fix GH-11492 (Make test failure: ext/pdo_sqlite/tests/bug_42589.phpt).
10+
(KapitanOczywisty, CViniciusSDias)
11+
812
- Session:
913
. Removed broken url support for transferring session ID. (ilutov)
1014

ext/pdo_sqlite/tests/bug_42589.phpt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ PDO SQLite Feature Request #42589 (getColumnMeta() should also return table name
33
--EXTENSIONS--
44
pdo
55
pdo_sqlite
6+
--SKIPIF--
7+
<?php
8+
$db = new PDO("sqlite::memory:");
9+
$options = $db->query('PRAGMA compile_options')->fetchAll(PDO::FETCH_COLUMN);
10+
if(!in_array('ENABLE_COLUMN_METADATA', $options, true))
11+
die("skip sqlite3 must be compiled with SQLITE_ENABLE_COLUMN_METADATA");
12+
?>
613
--FILE--
714
<?php
815
$db = new PDO("sqlite::memory:");

0 commit comments

Comments
 (0)