From 3aa6d590a12ce92e1f06ecc333c56676c2553095 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 11 Jul 2023 10:25:16 +1200 Subject: [PATCH] MNT Fix unit test --- tests/php/ORM/DataListTest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/php/ORM/DataListTest.php b/tests/php/ORM/DataListTest.php index 294123284..c5c5328aa 100755 --- a/tests/php/ORM/DataListTest.php +++ b/tests/php/ORM/DataListTest.php @@ -26,6 +26,7 @@ use SilverStripe\ORM\Tests\DataObjectTest\Team; use SilverStripe\ORM\Tests\DataObjectTest\TeamComment; use SilverStripe\ORM\Tests\DataObjectTest\ValidatedObject; use SilverStripe\ORM\Tests\ManyManyListTest\Category; +use SilverStripe\ORM\Connect\DatabaseException; class DataListTest extends SapphireTest { @@ -1860,7 +1861,7 @@ class DataListTest extends SapphireTest if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) { $this->markTestSkipped('Database connector is not MySQLiConnector'); } - $this->expectException(\mysqli_sql_exception::class); + $this->expectException(DatabaseException::class); $this->expectExceptionMessageMatches('/Unknown column/'); } elseif ($type === 'invalid-column') { $this->expectException(InvalidArgumentException::class); @@ -1891,7 +1892,7 @@ class DataListTest extends SapphireTest if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) { $this->markTestSkipped('Database connector is not MySQLiConnector'); } - $this->expectException(\mysqli_sql_exception::class); + $this->expectException(DatabaseException::class); if ($type === 'error-in-sql-syntax') { $this->expectExceptionMessageMatches('/You have an error in your SQL syntax/'); } else {