Skip to content

Smart eager loading #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Smart eager loading #172

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d81f854
ManyToOne eager loading
moufmouf Sep 5, 2019
aeda807
Fixing PostgreSQL dialect in MagicQuery
moufmouf Sep 5, 2019
9baee5a
Coding Style fix
moufmouf Sep 5, 2019
d8b675d
Fixing output dialect
moufmouf Sep 6, 2019
e34752b
Fixing PgSQL related test (order issue)
moufmouf Sep 6, 2019
558dcab
Improving code coverage and exception throwing for lazy beans
moufmouf Sep 6, 2019
f51198b
test fix for PGSQL + CS
moufmouf Sep 6, 2019
a25a8f6
Generating partial query only once
moufmouf Sep 9, 2019
a816e5b
Refactoring retrieveManyToOneRelationshipsStorage signature
moufmouf Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Generating partial query only once
  • Loading branch information
@moufmouf
moufmouf committed Sep 9, 2019
commit a25a8f6bcf4bc4c6a1ce619bf03e0b4d43b6fae7
24 changes: 13 additions & 11 deletions src/InnerResultIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use TheCodingMachine\TDBM\QueryFactory\SmartEagerLoad\PartialQueryFactory;
use TheCodingMachine\TDBM\QueryFactory\SmartEagerLoad\Query\PartialQuery;
use TheCodingMachine\TDBM\QueryFactory\SmartEagerLoad\StorageNode;
use TheCodingMachine\TDBM\Utils\DbalUtils;

Expand Down Expand Up @@ -68,11 +69,13 @@ class InnerResultIterator implements \Iterator, \Countable, \ArrayAccess
*/
private $logger;
/**
* @var PartialQueryFactory|null
* @var PartialQuery|null
*/
private $partialQueryFactory;

protected $count = null;
private $partialQuery;
/**
* @var int|null
*/
protected $count;

private function __construct()
{
Expand All @@ -96,7 +99,11 @@ public static function createInnerResultIterator(string $magicSql, array $parame
$iterator->magicQuery = $magicQuery;
$iterator->databasePlatform = $iterator->tdbmService->getConnection()->getDatabasePlatform();
$iterator->logger = $logger;
$iterator->partialQueryFactory = $partialQueryFactory;
$partialQuery = null;
if ($iterator instanceof StorageNode && $partialQueryFactory !== null) {
$iterator->partialQuery = $partialQueryFactory->getPartialQuery($iterator, $magicQuery, $parameters);
}

return $iterator;
}

Expand Down Expand Up @@ -208,11 +215,6 @@ public function next()
$beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
}

$partialQuery = null;
if ($this instanceof StorageNode && $this->partialQueryFactory !== null) {
$partialQuery = $this->partialQueryFactory->getPartialQuery($this, $this->magicQuery, $this->parameters);
}

$reflectionClassCache = [];
$firstBean = true;
foreach ($beansData as $beanData) {
Expand Down Expand Up @@ -250,7 +252,7 @@ public function next()
// Let's bypass the constructor when creating the bean!
/** @var AbstractTDBMObject $bean */
$bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
$bean->_constructFromData($beanData, $this->tdbmService, $partialQuery);
$bean->_constructFromData($beanData, $this->tdbmService, $this->partialQuery);
}

// The first bean is the one containing the main table.
Expand Down