tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
Steve Boyd 2023-07-17 11:52:07 +12:00
commit 771844335b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/php/ORM/DataListTest.php
View File

@ -51,6 +51,7 @@ use SilverStripe\ORM\Tests\DataListTest\BelongsManyManySubSubEagerLoadObject;
use SilverStripe\ORM\Tests\DataListTest\MixedHasManyEagerLoadObject; use SilverStripe\ORM\Tests\DataListTest\MixedHasManyEagerLoadObject;
use SilverStripe\ORM\Tests\DataListTest\MixedHasOneEagerLoadObject; use SilverStripe\ORM\Tests\DataListTest\MixedHasOneEagerLoadObject;
use SilverStripe\ORM\Tests\DataListTest\MixedManyManyEagerLoadObject; use SilverStripe\ORM\Tests\DataListTest\MixedManyManyEagerLoadObject;
use SilverStripe\ORM\Connect\DatabaseException;
class DataListTest extends SapphireTest class DataListTest extends SapphireTest
{ {
@ -1943,7 +1944,7 @@ class DataListTest extends SapphireTest
if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) { if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) {
$this->markTestSkipped('Database connector is not MySQLiConnector'); $this->markTestSkipped('Database connector is not MySQLiConnector');
} }
$this->expectException(\mysqli_sql_exception::class); $this->expectException(DatabaseException::class);
$this->expectExceptionMessageMatches('/Unknown column/'); $this->expectExceptionMessageMatches('/Unknown column/');
} elseif ($type === 'invalid-column') { } elseif ($type === 'invalid-column') {
$this->expectException(InvalidArgumentException::class); $this->expectException(InvalidArgumentException::class);
@ -1974,7 +1975,7 @@ class DataListTest extends SapphireTest
if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) { if (!(DB::get_conn()->getConnector() instanceof MySQLiConnector)) {
$this->markTestSkipped('Database connector is not MySQLiConnector'); $this->markTestSkipped('Database connector is not MySQLiConnector');
} }
$this->expectException(\mysqli_sql_exception::class); $this->expectException(DatabaseException::class);
if ($type === 'error-in-sql-syntax') { if ($type === 'error-in-sql-syntax') {
$this->expectExceptionMessageMatches('/You have an error in your SQL syntax/'); $this->expectExceptionMessageMatches('/You have an error in your SQL syntax/');
} else { } else {