removeUnusedColumns should execute only one sql query (#14752)

* removeUnusedColumns should execute only one sql query * Fix when only protected columns exists
pimcore · Mar 27, 2023 · 695f7c9 · 695f7c9
1 parent 295f5e8
commit 695f7c9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/models/DataObject/ClassDefinition/Helper/Dao.php b/models/DataObject/ClassDefinition/Helper/Dao.php
@@ -128,13 +128,17 @@ protected function addModifyColumn($table, $colName, $type, $default, $null)
     protected function removeUnusedColumns($table, $columnsToRemove, $protectedColumns)
     {
         if (is_array($columnsToRemove) && count($columnsToRemove) > 0) {
+            $dropColumns = [];
             foreach ($columnsToRemove as $value) {
                 //if (!in_array($value, $protectedColumns)) {
                 if (!in_array(strtolower($value), array_map('strtolower', $protectedColumns))) {
-                    $this->db->executeQuery('ALTER TABLE `' . $table . '` DROP COLUMN `' . $value . '`;');
+                    $dropColumns[] = 'DROP COLUMN `' . $value . '`';
                 }
             }
-            $this->resetValidTableColumnsCache($table);
+            if ($dropColumns) {
+                $this->db->executeQuery('ALTER TABLE `' . $table . '` ' . implode(', ', $dropColumns) . ';');
+                $this->resetValidTableColumnsCache($table);
+            }
         }
     }