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 '4.13' into 4

Browse Source
This commit is contained in:
Steve Boyd 2023-07-10 17:13:19 +12:00
commit 193a12ac01
4 changed files with 87 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ORM/Connect/MySQLiConnector.php
View File

@ -181,13 +181,20 @@ class MySQLiConnector extends DBConnector
{
$this->beforeQuery($sql);
$error = null;
$handle = null;
try {
// Benchmark query
$handle = $this->dbConn->query($sql ?? '', MYSQLI_STORE_RESULT);
} catch (mysqli_sql_exception $e) {
$error = $e->getMessage();
} finally {
if (!$handle || $this->dbConn->error) {
$this->databaseError($this->getLastError(), $errorLevel, $sql);
$this->databaseError($error ?? $this->getLastError(), $errorLevel, $sql);
return null;
}
}
// Some non-select queries return true on success
return new MySQLQuery($this, $handle);

2
src/ORM/PaginatedList.php
View File

@ -416,7 +416,7 @@ class PaginatedList extends ListDecorator
*/
public function LastPage()
{
return $this->CurrentPage() == $this->TotalPages();
return $this->CurrentPage() >= $this->TotalPages();
}
/**

113
tests/php/ORM/MySQLiConnectorTest.php
View File

@ -2,10 +2,12 @@
namespace SilverStripe\ORM\Tests;
use mysqli_driver;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\Tests\MySQLiConnectorTest\MySQLiConnector;
use SilverStripe\ORM\Connect\DatabaseException;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\Tests\MySQLiConnectorTest\MySQLiConnector;
use SilverStripe\Tests\ORM\Utf8\Utf8TestHelper;
/**
@ -13,21 +15,47 @@ use SilverStripe\Tests\ORM\Utf8\Utf8TestHelper;
*/
class MySQLiConnectorTest extends SapphireTest implements TestOnly
{
/** @var array project database settings configuration */
private $config = [];
private function getConnector(?string $charset = null, ?string $collation = null, bool $selectDb = false)
{
$config = $this->config;
if ($charset) {
$config['charset'] = $charset;
}
if ($collation) {
$config['collation'] = $collation;
}
$config['database'] = 'information_schema';
$connector = new MySQLiConnector();
$connector->connect($config, $selectDb);
return $connector;
}
public function setUp(): void
{
parent::setUp();
$config = DB::getConfig();
if (strtolower(substr($config['type'] ?? '', 0, 5)) !== 'mysql') {
$this->markTestSkipped("The test only relevant for MySQL - but $config[type] is in use");
}
$this->config = $config;
}
/**
* @dataProvider charsetProvider
*/
public function testConnectionCharsetControl($charset, $defaultCollation)
{
$config = DB::getConfig();
$config['charset'] = $charset;
$config['database'] = 'information_schema';
if (strtolower(substr($config['type'] ?? '', 0, 5)) !== 'mysql') {
return $this->markTestSkipped('The test only relevant for MySQL');
}
$connector = new MySQLiConnector();
$connector->connect($config);
$connector = $this->getConnector($charset);
$connection = $connector->getMysqliConnection();
$cset = $connection->get_charset();
@ -47,17 +75,7 @@ class MySQLiConnectorTest extends SapphireTest implements TestOnly
*/
public function testConnectionCollationControl($charset, $defaultCollation, $customCollation)
{
$config = DB::getConfig();
$config['charset'] = $charset;
$config['collation'] = $customCollation;
$config['database'] = 'information_schema';
if (strtolower(substr($config['type'] ?? '', 0, 5)) !== 'mysql') {
return $this->markTestSkipped('The test only relevant for MySQL');
}
$connector = new MySQLiConnector();
$connector->connect($config);
$connector = $this->getConnector($charset, $customCollation);
$connection = $connector->getMysqliConnection();
$cset = $connection->get_charset();
@ -101,20 +119,7 @@ class MySQLiConnectorTest extends SapphireTest implements TestOnly
public function testUtf8mb4GeneralCollation()
{
$charset = 'utf8mb4';
$collation = 'utf8mb4_general_ci';
$config = DB::getConfig();
$config['charset'] = $charset;
$config['collation'] = $collation;
$config['database'] = 'information_schema';
if (strtolower(substr($config['type'] ?? '', 0, 5)) !== 'mysql') {
return $this->markTestSkipped('The test only relevant for MySQL');
}
$connector = new MySQLiConnector();
$connector->connect($config, true);
$connector = $this->getConnector('utf8mb4', 'utf8mb4_general_ci', true);
$connection = $connector->getMysqliConnection();
$result = $connection->query(
@ -127,20 +132,7 @@ class MySQLiConnectorTest extends SapphireTest implements TestOnly
public function testUtf8mb4UnicodeCollation()
{
$charset = 'utf8mb4';
$collation = 'utf8mb4_unicode_ci';
$config = DB::getConfig();
$config['charset'] = $charset;
$config['collation'] = $collation;
$config['database'] = 'information_schema';
if (strtolower(substr($config['type'] ?? '', 0, 5)) !== 'mysql') {
return $this->markTestSkipped('The test only relevant for MySQL');
}
$connector = new MySQLiConnector();
$connector->connect($config, true);
$connector = $this->getConnector('utf8mb4', 'utf8mb4_unicode_ci', true);
$connection = $connector->getMysqliConnection();
$result = $connection->query(
@ -151,4 +143,25 @@ class MySQLiConnectorTest extends SapphireTest implements TestOnly
$this->assertEquals('rßt', $result[0][0]);
$this->assertEquals('rst', $result[1][0]);
}
public function testQueryThrowsDatabaseErrorOnMySQLiError()
{
$connector = $this->getConnector();
$driver = new mysqli_driver();
// The default with PHP >= 8.0
$driver->report_mode = MYSQLI_REPORT_OFF;
$this->expectException(DatabaseException::class);
$connector = $this->getConnector(null, null, true);
$connector->query('force an error with invalid SQL');
}
public function testQueryThrowsDatabaseErrorOnMySQLiException()
{
$driver = new mysqli_driver();
// The default since PHP 8.1 - https://www.php.net/manual/en/mysqli-driver.report-mode.php
$driver->report_mode = MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT;
$this->expectException(DatabaseException::class);
$connector = $this->getConnector(null, null, true);
$connector->query('force an error with invalid SQL');
}
}

11
tests/php/ORM/PaginatedListTest.php
View File

@ -303,9 +303,20 @@ class PaginatedListTest extends SapphireTest
$list = new PaginatedList(new ArrayList());
$list->setTotalItems(50);
$this->assertFalse($list->LastPage());
$list->setCurrentPage(4);
$this->assertFalse($list->LastPage());
$list->setCurrentPage(5);
$this->assertTrue($list->LastPage());
$list->setCurrentPage(6);
$this->assertTrue($list->LastPage());
$emptyList = new PaginatedList(new ArrayList());
$emptyList->setTotalItems(0);
$this->assertTrue($emptyList->LastPage());
$emptyList->setCurrentPage(1);
$this->assertTrue($emptyList->LastPage());
}
public function testNotLastPage()