Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Avoid double table prefixing when cache not pregenerated in dev environments

Browse Source 
[MAILPOET-2235]
This commit is contained in:
Jan Jakeš
2019-07-30 17:00:37 +02:00
committed by Jan Jakeš
parent 1bc2119c63
commit 35a56bacd7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Doctrine/TablePrefixMetadataFactory.php
View File

@ -26,7 +26,14 @@ class TablePrefixMetadataFactory extends ClassMetadataFactory {
function getMetadataFor($className) { function getMetadataFor($className) {
$classMetadata = parent::getMetadataFor($className); $classMetadata = parent::getMetadataFor($className);
if ($classMetadata instanceof ClassMetadata && !isset($this->prefixed_map[$classMetadata->getName()])) { if (isset($this->prefixed_map[$classMetadata->getName()])) {
return $classMetadata;
}
// prefix tables only after they are saved to cache so the prefix does not get included in cache
// (getMetadataFor can call itself recursively but it saves to cache only after the recursive calls)
$is_cached = $this->getCacheDriver()->contains($classMetadata->getName() . $this->cacheSalt);
if ($classMetadata instanceof ClassMetadata && $is_cached) {
$this->addPrefix($classMetadata); $this->addPrefix($classMetadata);
$this->prefixed_map[$classMetadata->getName()] = true; $this->prefixed_map[$classMetadata->getName()] = true;
} }