Merge branch 'hotfix/v2.3.15'

roadiz · Jun 26, 2024 · 7fb21f7 · 7fb21f7
2 parents b154c93 + a3ff4c2
commit 7fb21f7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to Roadiz will be documented in this file.
 
+## [2.3.15](https://github.com/roadiz/core-bundle-dev-app/compare/v2.3.14...v2.3.15) - 2024-06-26
+
+### Bug Fixes
+
+- Still execute migration Version20240318204224 when there are no node_type_fields: i.e at Roadiz first install - ([6fda4a9](https://github.com/roadiz/core-bundle-dev-app/commit/6fda4a9b55361d9d49e847c79cc1876f5f3cce0a))
+
 ## [2.3.14](https://github.com/roadiz/core-bundle-dev-app/compare/v2.3.13...v2.3.14) - 2024-06-21
 
 ### Bug Fixes

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.3.14'
+    roadiz_core.cms_version: '2.3.15'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/lib/RoadizCoreBundle/migrations/Version20240318204224.php b/lib/RoadizCoreBundle/migrations/Version20240318204224.php
@@ -19,11 +19,16 @@ public function getDescription(): string
 
     public function up(Schema $schema): void
     {
-        $result = $this->connection->executeQuery('SELECT max(length(name)) FROM `node_type_fields`');
-        $maxLength = $result->fetchOne();
+        $result = $this->connection->executeQuery('SELECT count(id) FROM `node_type_fields`');
+        $count = $result->fetchOne();
 
-        $this->skipIf(!is_numeric($maxLength), 'Cannot find node_type_fields name maximum length.');
-        $this->skipIf($maxLength >= 50, 'You have at least on node_type_field name that exceed 50 characters long.');
+        if ($count > 0) {
+            $result = $this->connection->executeQuery('SELECT max(length(name)) FROM `node_type_fields`');
+            $maxLength = $result->fetchOne();
+
+            $this->skipIf(!is_numeric($maxLength), 'Cannot find node_type_fields name maximum length.');
+            $this->skipIf($maxLength >= 50, 'You have at least on node_type_field name that exceed 50 characters long.');
+        }
 
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE node_type_fields CHANGE name name VARCHAR(50) NOT NULL');