NEXT-29992 - Fix mariadb compatibility

shopware · Aug 22, 2023 · 9cf0a1b · 9cf0a1b
1 parent bd9d8b9
commit 9cf0a1b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 17 deletions.
diff --git a/.gitlab/stages/11-build.yml b/.gitlab/stages/11-build.yml
@@ -5,7 +5,7 @@ Build:
     stage: lint
     needs: []
     services:
-      -   name: mariadb:10.10.5
+      -   name: mariadb:10.10
           alias: database
           entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
     rules:

diff --git a/.gitlab/stages/20-unit.yml b/.gitlab/stages/20-unit.yml
@@ -108,7 +108,7 @@ PHP unit:
     needs: []
     timeout: 30m
     services:
-        -   name: mariadb:10.4.30
+        -   name: mariadb:10.4
             alias: database
             entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
         -   name: redis
@@ -149,7 +149,7 @@ PHP unit:
 PHP unit Elasticsearch:
   extends: PHP unit
   services:
-    - name: mariadb:10.4.30
+    - name: mariadb:10.4
       alias: database
       entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
     - name: redis
@@ -169,7 +169,7 @@ PHP bench:
     timeout: 30m
     needs: []
     services:
-        -   name: mariadb:10.4.30
+        -   name: mariadb:10.4
             alias: database
             entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
         -   name: redis
@@ -268,7 +268,7 @@ PHP migration coverage:
     needs: []
     timeout: 10m
     services:
-        -   name: mariadb:10.4.30
+        -   name: mariadb:10.4
             alias: database
             entrypoint: [ "sh", "-c", "docker-entrypoint.sh $MYSQL_CMD" ]
     variables:
@@ -343,19 +343,19 @@ PHP Full:
                 DEV_IMAGE: [ "shopware/development:8.1-composer-2" , "shopware/development:8.2-composer-2"]
                 FEATURE_ALL: [ "false", "major" ]
                 MYSQL_CMD: 'mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password --sql-require-primary-key=ON'
-            -   MYSQL_IMAGE: mariadb:10.4.30
+            -   MYSQL_IMAGE: mariadb:10.4
                 DEV_IMAGE: shopware/development:8.1-composer-2
                 FEATURE_ALL: 'false'
-            -   MYSQL_IMAGE: mariadb:10.5.21
+            -   MYSQL_IMAGE: mariadb:10.5
                 DEV_IMAGE: shopware/development:8.1-composer-2
                 FEATURE_ALL: 'false'
                 PREFER_LOWEST: 'true'
-            -   MYSQL_IMAGE: mariadb:10.11.4
+            -   MYSQL_IMAGE: mariadb:10.11
                 DEV_IMAGE: shopware/development:8.1-composer-2
                 FEATURE_ALL: 'false'
                 ONLY_CORE: 'true'
                 TEST_SUITES: "checkout content framework profiling system integration migration"
-            -   MYSQL_IMAGE: mariadb:11.0.2
+            -   MYSQL_IMAGE: mariadb:11.0
                 DEV_IMAGE: shopware/development:8.1-composer-2
                 FEATURE_ALL: 'false'
                 DEPENDENCY_DEV: 'true'
@@ -421,7 +421,7 @@ PHP Full quarantined:
       - !reference [ .rules, long-running ]
     parallel:
         matrix:
-            - MYSQL_IMAGE: mariadb:10.4.30
+            - MYSQL_IMAGE: mariadb:10.4
               DEV_IMAGE: shopware/development:8.1-composer-2
               FEATURE_ALL: 'false'
               ALLOW_FAILURE: 'true'

diff --git a/.gitlab/stages/22-performance.yml b/.gitlab/stages/22-performance.yml
@@ -8,7 +8,7 @@ Lighthouse (Administration):
     needs: [ Build, 'Jest (Administration)' ]
     dependencies: [ Build ]
     services:
-        -   name: mariadb:10.4.30
+        -   name: mariadb:10.4
             alias: database
     variables:
       # Use e2e env to deactivate the admin queue worker
@@ -42,7 +42,7 @@ Lighthouse Server (Storefront):
     allow_failure: true
     timeout: 1h
     services:
-        -   name: mariadb:10.4.30
+        -   name: mariadb:10.4
             alias: database
     variables:
         APP_ENV: prod

diff --git a/.gitlab/stages/30-e2e.yml b/.gitlab/stages/30-e2e.yml
@@ -6,7 +6,7 @@
   needs: [ Build, 'Jest (Administration)' ]
   dependencies: [ Build ]
   services:
-    - name: mariadb:10.4.30
+    - name: mariadb:10.4
       alias: database
   variables:
     APP_ENV: e2e

diff --git a/.gitlab/stages/70-visual.yml b/.gitlab/stages/70-visual.yml
@@ -4,7 +4,7 @@ Percy:
     stage: visual
     timeout: 1h
     services:
-        -   name: mariadb:10.4.30
+        -   name: mariadb:10.4
             alias: database
     dependencies: [ Build ]
     variables:

diff --git a/changelog/_unreleased/2023-08-18-fix-mariadb-compatibility.md b/changelog/_unreleased/2023-08-18-fix-mariadb-compatibility.md
@@ -0,0 +1,8 @@
+---
+title: Fix mariadb compatibility
+issue: NEXT-29992
+---
+
+# Core
+
+* Changed migration `Shopware/Core/Migration/V6_4/Migration1656397126AddMainVariantConfiguration` to drop the foreign key constraint before creating a generated column to bypass a new MariaDB limitation
diff --git a/src/Core/Migration/V6_4/Migration1656397126AddMainVariantConfiguration.php b/src/Core/Migration/V6_4/Migration1656397126AddMainVariantConfiguration.php
@@ -27,6 +27,13 @@ public function update(Connection $connection): void
         }
 
         if (!EntityDefinitionQueryHelper::columnExists($connection, 'product', 'variant_listing_config')) {
+            // Will be dropped anyway in future migrations: Shopware\Core\Migration\V6_5\Migration1678969082DropVariantListingFields
+            try {
+                $connection->executeStatement('ALTER TABLE `product` DROP FOREIGN KEY `fk.product.main_variant_id`');
+            } catch (\Throwable $e) {
+                // ignore when missing
+            }
+
             $connection->executeStatement(
                 'ALTER TABLE `product` ADD COLUMN `variant_listing_config` JSON
                         GENERATED ALWAYS AS (CASE WHEN `display_parent` IS NOT NULL OR `main_variant_id` IS NOT NULL OR `configurator_group_config` IS NOT NULL

diff --git a/src/Core/Migration/V6_5/Migration1678969082DropVariantListingFields.php b/src/Core/Migration/V6_5/Migration1678969082DropVariantListingFields.php
@@ -36,8 +36,15 @@ public function updateDestructive(Connection $connection): void
         }
 
         if ($this->columnExists($connection, 'product', 'main_variant_id')) {
+            // Maybe FK still exists, so we need to drop it first
+            try {
+                $connection->executeStatement('ALTER TABLE `product` DROP FOREIGN KEY `fk.product.main_variant_id`');
+            } catch (\Exception) {
+                // ignore
+            }
+
             $connection->executeStatement(
-                'ALTER TABLE `product` DROP FOREIGN KEY `fk.product.main_variant_id`, DROP COLUMN `main_variant_id`'
+                'ALTER TABLE `product` DROP COLUMN `main_variant_id`'
             );
         }
     }

diff --git a/tests/migration/Core/V6_5/Migration1678197291ConvertVariantListingConfigTest.php b/tests/migration/Core/V6_5/Migration1678197291ConvertVariantListingConfigTest.php
@@ -125,8 +125,7 @@ private function rollbackMigration(): void
 
         if (!EntityDefinitionQueryHelper::columnExists($this->connection, 'product', 'main_variant_id')) {
             $this->connection->executeStatement(
-                'ALTER TABLE `product` ADD COLUMN `main_variant_id` binary(16) DEFAULT NULL,
-                        ADD CONSTRAINT `fk.product.main_variant_id` FOREIGN KEY (`main_variant_id`) REFERENCES `product` (`id`) ON DELETE SET NULL'
+                'ALTER TABLE `product` ADD COLUMN `main_variant_id` binary(16) DEFAULT NULL'
             );
         }