From 928baa3d30315b9a60d6eb669cdd3aeef66e2381 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Oct 2025 00:10:42 +0200
Subject: [PATCH 1/3] Fix test on 8.4+

---
 ext/pdo_mysql/tests/gh20122.phpt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/pdo_mysql/tests/gh20122.phpt b/ext/pdo_mysql/tests/gh20122.phpt
index fb3bd70a7e7f5..9ae6454d93545 100644
--- a/ext/pdo_mysql/tests/gh20122.phpt
+++ b/ext/pdo_mysql/tests/gh20122.phpt
@@ -8,11 +8,10 @@ pdo_mysql
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
 ?>
---XFAIL--
 --FILE--
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
-$pdo = MySQLPDOTest::factory();
+$db = MySQLPDOTest::factory();
 
 $db->exec('CREATE TABLE test (bar JSON)');
 $db->exec('INSERT INTO test VALUES("[]")');

From 0edab53384459efc20433a7e36f2243a6775739a Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Oct 2025 08:08:59 +0200
Subject: [PATCH 2/3] more fixes

---
 ext/pdo_mysql/tests/gh20122.phpt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ext/pdo_mysql/tests/gh20122.phpt b/ext/pdo_mysql/tests/gh20122.phpt
index 9ae6454d93545..97048f56a3bdb 100644
--- a/ext/pdo_mysql/tests/gh20122.phpt
+++ b/ext/pdo_mysql/tests/gh20122.phpt
@@ -13,10 +13,10 @@ MySQLPDOTest::skip();
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 $db = MySQLPDOTest::factory();
 
-$db->exec('CREATE TABLE test (bar JSON)');
-$db->exec('INSERT INTO test VALUES("[]")');
+$db->exec('CREATE TABLE test_gh20122 (bar JSON)');
+$db->exec('INSERT INTO test_gh20122 VALUES("[]")');
 
-$stmt = $db->query('SELECT * from test');
+$stmt = $db->query('SELECT * from test_gh20122');
 $meta = $stmt->getColumnMeta(0);
 
 // Note: JSON is an alias for LONGTEXT on MariaDB!
@@ -25,7 +25,8 @@ echo $meta['native_type'], "\n";
 --CLEAN--
 <?php
 require __DIR__ . '/mysql_pdo_test.inc';
-MySQLPDOTest::dropTestTable();
+$pdo = MySQLPDOTest::factory();
+$pdo->query('DROP TABLE IF EXISTS test_gh20122');
 ?>
 --EXPECTF--
 %r(JSON|LONGTEXT)%r

From 6e444d01a9b5014325bfdbfcaad32be86cf23115 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 17 Oct 2025 08:20:47 +0200
Subject: [PATCH 3/3] Fix include path

---
 ext/pdo_mysql/tests/gh20122.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/pdo_mysql/tests/gh20122.phpt b/ext/pdo_mysql/tests/gh20122.phpt
index 97048f56a3bdb..f4abc266335af 100644
--- a/ext/pdo_mysql/tests/gh20122.phpt
+++ b/ext/pdo_mysql/tests/gh20122.phpt
@@ -24,7 +24,7 @@ echo $meta['native_type'], "\n";
 ?>
 --CLEAN--
 <?php
-require __DIR__ . '/mysql_pdo_test.inc';
+require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 $pdo = MySQLPDOTest::factory();
 $pdo->query('DROP TABLE IF EXISTS test_gh20122');
 ?>