diff --git a/application/Espo/Core/Utils/Database/MetadataProvider.php b/application/Espo/Core/Utils/Database/MetadataProvider.php new file mode 100644 index 0000000000..e07464306e --- /dev/null +++ b/application/Espo/Core/Utils/Database/MetadataProvider.php @@ -0,0 +1,54 @@ +metadata->get(['app', 'recordId', 'length']) ?? + self::DEFAULT_ID_LENGTH; + } + + public function getIdDbType(): string + { + return $this->metadata->get(['app', 'recordId', 'dbType']) ?? + self::DEFAULT_ID_DB_TYPE; + } +} diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php index 4bf618631a..98e9b01b9d 100644 --- a/application/Espo/Core/Utils/Database/Orm/Converter.php +++ b/application/Espo/Core/Utils/Database/Orm/Converter.php @@ -32,6 +32,7 @@ namespace Espo\Core\Utils\Database\Orm; use Doctrine\DBAL\Types\Types; use Espo\Core\InjectableFactory; use Espo\Core\Utils\Database\ConfigDataProvider; +use Espo\Core\Utils\Database\MetadataProvider; use Espo\Core\Utils\Util; use Espo\ORM\Defs\AttributeDefs; use Espo\ORM\Defs\FieldDefs; @@ -90,9 +91,6 @@ class Converter /** @var array */ private $idParams = []; - private const DEFAULT_ID_LENGTH = 24; - private const DEFAULT_ID_DB_TYPE = Types::STRING; - /** * Permitted entityDefs parameters which will be copied to ormMetadata. * @@ -111,17 +109,15 @@ class Converter private MetadataHelper $metadataHelper, private InjectableFactory $injectableFactory, ConfigDataProvider $configDataProvider, - IndexHelperFactory $indexHelperFactory + IndexHelperFactory $indexHelperFactory, + MetadataProvider $metadataProvider ) { $platform = $configDataProvider->getPlatform(); $this->indexHelper = $indexHelperFactory->create($platform); - $this->idParams['len'] = $this->metadata->get(['app', 'recordId', 'length']) ?? - self::DEFAULT_ID_LENGTH; - - $this->idParams['dbType'] = $this->metadata->get(['app', 'recordId', 'dbType']) ?? - self::DEFAULT_ID_DB_TYPE; + $this->idParams['len'] = $metadataProvider->getIdLength(); + $this->idParams['dbType'] = $metadataProvider->getIdDbType(); } /** diff --git a/application/Espo/Core/Utils/Database/Schema/Builder.php b/application/Espo/Core/Utils/Database/Schema/Builder.php index 581de432a3..48449ace8f 100644 --- a/application/Espo/Core/Utils/Database/Schema/Builder.php +++ b/application/Espo/Core/Utils/Database/Schema/Builder.php @@ -30,6 +30,7 @@ namespace Espo\Core\Utils\Database\Schema; use Espo\Core\Utils\Database\ConfigDataProvider; +use Espo\Core\Utils\Database\MetadataProvider as MetadataProvider; use Espo\Core\Utils\File\Manager as FileManager; use Espo\Core\Utils\Log; use Espo\Core\Utils\Metadata; @@ -53,13 +54,10 @@ use Doctrine\DBAL\Types\Type as DbalType; */ class Builder { - private const DEFAULT_ID_LENGTH = 24; - private const DEFAULT_ID_DB_TYPE = Types::STRING; - private const ATTR_ID = 'id'; private const ATTR_DELETED = 'deleted'; - private string $idLength; + private int $idLength; private string $idDbType; private string $tablesPath = 'Core/Utils/Database/Schema/tables'; @@ -73,7 +71,8 @@ class Builder private Log $log, private PathProvider $pathProvider, ConfigDataProvider $configDataProvider, - ColumnPreparatorFactory $columnPreparatorFactory + ColumnPreparatorFactory $columnPreparatorFactory, + MetadataProvider $metadataProvider ) { $this->typeList = array_keys(DbalType::getTypesMap()); @@ -81,11 +80,8 @@ class Builder $this->columnPreparator = $columnPreparatorFactory->create($platform); - $this->idLength = $this->metadata->get(['app', 'recordId', 'length']) ?? - self::DEFAULT_ID_LENGTH; - - $this->idDbType = $this->metadata->get(['app', 'recordId', 'dbType']) ?? - self::DEFAULT_ID_DB_TYPE; + $this->idLength = $metadataProvider->getIdLength(); + $this->idDbType = $metadataProvider->getIdDbType(); } /**