EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Fix tester dbal usage. Fix diff
Yurii9b2db1af4adf
diff --git a/application/Espo/Core/Utils/Database/Schema/DiffModifier.php b/application/Espo/Core/Utils/Database/Schema/DiffModifier.phpindex 78c8a0982a..b42e57534e 100644--- a/application/Espo/Core/Utils/Database/Schema/DiffModifier.php+++ b/application/Espo/Core/Utils/Database/Schema/DiffModifier.php@@ -30,6 +30,7 @@namespace Espo\Core\Utils\Database\Schema;use Doctrine\DBAL\Exception as DbalException;+use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;use Doctrine\DBAL\Schema\Column as Column;use Doctrine\DBAL\Schema\ColumnDiff;use Doctrine\DBAL\Schema\Index;@@ -41,12 +42,18 @@ use Doctrine\DBAL\Types\Type;use Doctrine\DBAL\Types\Types;use Espo\Core\Utils\Database\Dbal\Types\LongtextType;use Espo\Core\Utils\Database\Dbal\Types\MediumtextType;+use Espo\Core\Utils\Database\Helper;use Espo\ORM\Name\Attribute;class DiffModifier{private const int DEFAULT_VARCHAR_LENGTH = 255;+ public function __construct(+ private Helper $helper,+ ) {}++/*** @param RebuildMode::* $mode* @throws DbalException@@ -120,8 +127,10 @@ class DiffModifier$tableDiff = $this->cloneTableDiffWithoutDroppedColumns($tableDiff);}- foreach ($tableDiff->getAddedColumns() as $column) {- $reRun = $this->amendAddedColumnAutoincrement($column) || $reRun;+ if ($this->helper->getDbalConnection()->getDatabasePlatform() instanceof AbstractMySQLPlatform) {+ foreach ($tableDiff->getAddedColumns() as $column) {+ $reRun = $this->amendAddedColumnAutoincrement($column) || $reRun;+ }}$changedColumns = [];diff --git a/application/Espo/Core/Utils/Database/Schema/SchemaManager.php b/application/Espo/Core/Utils/Database/Schema/SchemaManager.phpindex c3ac62daa3..e2980a6600 100644--- a/application/Espo/Core/Utils/Database/Schema/SchemaManager.php+++ b/application/Espo/Core/Utils/Database/Schema/SchemaManager.php@@ -58,6 +58,7 @@ class SchemaManagerprivate AbstractSchemaManager $schemaManager;private Comparator $comparator;private Builder $builder;+ private DiffModifier $diffModifier;/*** @throws DbalException@@ -67,7 +68,6 @@ class SchemaManagerprivate Log $log,private Helper $helper,private MetadataProvider $metadataProvider,- private DiffModifier $diffModifier,private InjectableFactory $injectableFactory) {$this->schemaManager = $this->getDbalConnection()@@ -92,6 +92,13 @@ class SchemaManager->bindInstance(Helper::class, $this->helper)->build());++ $this->diffModifier = $this->injectableFactory->createWithBinding(+ DiffModifier::class,+ BindingContainerBuilder::create()+ ->bindInstance(Helper::class, $this->helper)+ ->build()+ );}public function getDatabaseHelper(): Helperdiff --git a/tests/integration/Core/Tester.php b/tests/integration/Core/Tester.phpindex ef7838e987..03556bd1e2 100644--- a/tests/integration/Core/Tester.php+++ b/tests/integration/Core/Tester.php@@ -365,7 +365,7 @@ class Testerthrow new RuntimeException('No "dbname" in database config.');}- $params = $params->withName(null);+ //$params = $params->withName(null);$pdo = $databaseHelper->createPDO($params);@@ -374,7 +374,6 @@ class Tester->create($params);$schemaManager = $connection->createSchemaManager();- $platform = $connection->getDatabasePlatform();foreach ($schemaManager->introspectDatabaseNames() as $databaseName) {if ($dbname === $databaseName->getIdentifier()->getValue()) {@@ -382,6 +381,8 @@ class Tester}}+ $platform = $connection->getDatabasePlatform();+$schemaManager->createDatabase($platform->quoteSingleIdentifier($dbname));}@@ -407,7 +408,7 @@ class Tester$tables = $schemaManager->introspectTables();foreach ($tables as $table) {- $tableQuoted = $table->getObjectName()->toString();+ $tableQuoted = $table->getObjectName()->toSQL($platform);$sql = $platform->getDropTableSQL($tableQuoted);diff --git a/tests/integration/Espo/Core/Utils/Database/RebuildTest.php b/tests/integration/Espo/Core/Utils/Database/RebuildTest.phpindex b9f2aa244f..c89473d080 100644--- a/tests/integration/Espo/Core/Utils/Database/RebuildTest.php+++ b/tests/integration/Espo/Core/Utils/Database/RebuildTest.php@@ -189,15 +189,10 @@ class RebuildTest extends BaseTestCase// Enable autoincrement back.--if ($this->getPlatform() !== 'Postgresql') {$this->runAutoincrementBack($entity, $table);}---// Delete entity type.$emTool->delete('C' . self::ENTITY_TYPE_TEST);