From ddeed3b5fcb90d766af9574a64a67254e2223e23 Mon Sep 17 00:00:00 2001
From: aynsix <asr@esokia-webagency.com>
Date: Fri, 26 Nov 2021 10:32:41 +0300
Subject: [PATCH] update doctrine table schema before applying patch

---
 lib/classes/appbox.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/classes/appbox.php b/lib/classes/appbox.php
index 34ee8e9622..4c546a5dc0 100644
--- a/lib/classes/appbox.php
+++ b/lib/classes/appbox.php
@@ -225,6 +225,13 @@ class appbox extends base
         // it is need before applying patches
         $advices = $this->upgradeDB(false, $app);
 
+        // update also the doctrine table schema before applying patch
+        if ($app['orm.em']->getConnection()->getDatabasePlatform()->supportsAlterTable()) {
+            $tool = new SchemaTool($app['orm.em']);
+            $metas = $app['orm.em']->getMetadataFactory()->getAllMetadata();
+            $tool->updateSchema($metas, true);
+        }
+
         foreach ($this->get_databoxes() as $s) {
             $advices = array_merge($advices, $s->upgradeDB(false, $app));
         }
@@ -240,12 +247,6 @@ class appbox extends base
 
         $app['phraseanet.cache-service']->flushAll();
 
-        if ($app['orm.em']->getConnection()->getDatabasePlatform()->supportsAlterTable()) {
-            $tool = new SchemaTool($app['orm.em']);
-            $metas = $app['orm.em']->getMetadataFactory()->getAllMetadata();
-            $tool->updateSchema($metas, true);
-        }
-
         if (version::lt($from_version, '3.1')) {
             $upgrader->addRecommendation($app->trans('Your install requires data migration, please execute the following command'), 'bin/setup system:upgrade-datas --from=3.1');
         } elseif (version::lt($from_version, '3.5')) {