composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-05 09:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

dbobjectset : check cache use via phpunit tests

Browse Source
This commit is contained in:
odain
2025-12-30 12:05:32 +01:00
parent e58e699288
commit afdfb2acf1
3 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/cmdbsource.class.inc.php
View File

@@ -537,6 +537,12 @@ class CMDBSource
*/
public static function Query($sSQLQuery)
{
if (self::$sRaisesExceptionMsgWhenSqlQuery) {
$e = new \Exception(self::$sRaisesExceptionMsgWhenSqlQuery);
\IssueLog::Error(__METHOD__, null, [$e->getTraceAsString()]);
throw $e;
}
if (preg_match('/^START TRANSACTION;?$/i', $sSQLQuery)) {
self::StartTransaction();
@@ -556,6 +562,13 @@ class CMDBSource
return self::DBQuery($sSQLQuery);
}
public static ?string $sRaisesExceptionMsgWhenSqlQuery = null;
public static function TriggerExceptionWhenSqlQuery(?string $sMsg)
{
self::$sRaisesExceptionMsgWhenSqlQuery = $sMsg;
}
/**
* Send the query directly to the DB. **Be extra cautious with this !**
*

27
core/dbobjectset.class.php
View File

@@ -871,23 +871,7 @@ class DBObjectSet implements iDBObjectSetIterator
*/
public function CountExceeds($iLimit)
{
if (is_null($this->m_iNumTotalDBRows)) {
$oKPI = new ExecutionKPI();
$sSQL = $this->m_oFilter->MakeSelectQuery([], $this->m_aArgs, null, null, $iLimit + 2, 0, true);
$resQuery = CMDBSource::Query($sSQL);
$sOQL = $this->GetPseudoOQL($this->m_oFilter, [], $iLimit + 2, 0, true);
$oKPI->ComputeStats('OQL Query Exec', $sOQL);
if ($resQuery) {
$aRow = CMDBSource::FetchArray($resQuery);
$iCount = intval($aRow['COUNT']);
CMDBSource::FreeResult($resQuery);
} else {
$iCount = 0;
}
} else {
$iCount = $this->m_iNumTotalDBRows;
}
$iCount = $this->CountWithLimit($iLimit);
return ($iCount > $iLimit);
}
@@ -913,8 +897,8 @@ class DBObjectSet implements iDBObjectSetIterator
$oKPI->ComputeStats('OQL Query Exec', $sOQL);
if ($resQuery) {
$aRow = CMDBSource::FetchArray($resQuery);
CMDBSource::FreeResult($resQuery);
$iCount = intval($aRow['COUNT']);
CMDBSource::FreeResult($resQuery);
} else {
$iCount = 0;
}
@@ -1063,12 +1047,7 @@ class DBObjectSet implements iDBObjectSetIterator
$this->Load();
}
if ($iRow > 0) {
$this->m_iCurrRow = min($iRow, $this->Count());
} else {
$this->m_iCurrRow = $iRow;
}
$this->m_iCurrRow = min($iRow, $this->Count());
if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows) {
$this->m_oSQLResult->data_seek($this->m_iCurrRow);
}

65
tests/php-unit-tests/unitary-tests/core/DBObject/DBObjectSetTest.php Normal file
View File

@@ -0,0 +1,65 @@
<?php
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
class DBObjectSetTest extends ItopDataTestCase
{
protected function tearDown(): void
{
CMDBSource::TriggerExceptionWhenSqlQuery(null);
parent::tearDown(); // TODO: Change the autogenerated stub
}
public function testCount()
{
$oSearch = DBObjectSearch::FromOQL_AllData("SELECT UserRequest");
$oSet = new DBObjectSet($oSearch);
$iCount = $oSet->Count();
$oSet->Fetch();
$this->assertEquals($iCount, $oSet->Count());
$this->assertEquals($iCount, $oSet->CountWithLimit(0));
$this->assertTrue($oSet->CountExceeds(0));
//no DB SQL query: exception will be raised after here
CMDBSource::TriggerExceptionWhenSqlQuery(__METHOD__.' :'.__LINE__);
$this->assertEquals($iCount, $oSet->Count(), 'should use cache and not call DB again');
}
public function testRewind()
{
$oSearch = DBObjectSearch::FromOQL_AllData("SELECT UserRequest");
$oSet = new DBObjectSet($oSearch);
while ($oObj = $oSet->Fetch()) {
$this->assertNotEquals(0, $oObj->GetKey());
}
//no DB SQL query: exception will be raised after here
CMDBSource::TriggerExceptionWhenSqlQuery(__METHOD__.' :'.__LINE__);
$oSet->Rewind();
while ($oObj = $oSet->Fetch()) {
$this->assertNotEquals(0, $oObj->GetKey());
}
}
public function testDBObjectSetComparator()
{
$oSearch = DBObjectSearch::FromOQL_AllData("SELECT UserRequest");
$DBObjectSet1 = new DBObjectSet($oSearch);
$DBObjectSet3 = new DBObjectSet($oSearch);
$oDBObjectSetComparator = new DBObjectSetComparator($DBObjectSet1, $DBObjectSet3);
$this->assertTrue($oDBObjectSetComparator->SetsAreEquivalent());
$sMsg = __METHOD__.' :'.__LINE__;
//no DB SQL query: exception will be raised after here
CMDBSource::TriggerExceptionWhenSqlQuery($sMsg);
$oDBObjectSetComparator = new DBObjectSetComparator($DBObjectSet1, $DBObjectSet3);
$this->assertTrue($oDBObjectSetComparator->SetsAreEquivalent());
$oDBObjectSetComparator = new DBObjectSetComparator($DBObjectSet1, new DBObjectSet($oSearch));
$this->expectExceptionMessage($sMsg, "should call DB again this time");
$this->assertTrue($oDBObjectSetComparator->SetsAreEquivalent());
}
}