From 198af76c58017bd9c23b0b4b87013e169feaadb9 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 13 Jul 2020 17:12:52 +0200
Subject: [PATCH] FEAT #14249 TIME 0:10 Minor update improve
---
migration/20.03/20036.sql | 2 +-
.../controllers/VersionUpdateController.php | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/migration/20.03/20036.sql b/migration/20.03/20036.sql
index f2dc0e04303..c6b2241791f 100644
--- a/migration/20.03/20036.sql
+++ b/migration/20.03/20036.sql
@@ -5,7 +5,7 @@
-- --
-- --
-- *************************************************************************--
---usergroups_services|groupbasket
+--DATABASE_BACKUP|usergroups_services|groupbasket
DELETE FROM usergroups_services WHERE service_id = 'include_folders_and_followed_resources_perimeter';
diff --git a/src/app/versionUpdate/controllers/VersionUpdateController.php b/src/app/versionUpdate/controllers/VersionUpdateController.php
index 4fad1644a26..3413d6f8800 100755
--- a/src/app/versionUpdate/controllers/VersionUpdateController.php
+++ b/src/app/versionUpdate/controllers/VersionUpdateController.php
@@ -218,11 +218,18 @@ class VersionUpdateController
foreach ($args['sqlFiles'] as $sqlFile) {
$fileContent = file_get_contents($sqlFile);
$explodedFile = explode("\n", $fileContent);
- $explodedFile[7] = str_replace('--', '', $explodedFile[7]);
- $explodedLine = explode('|', $explodedFile[7]);
- foreach ($explodedLine as $table) {
- if (!empty($table)) {
- $tablesToSave .= ' -t ' . trim($table);
+ foreach ($explodedFile as $key => $line) {
+ if (strpos($line, '--DATABASE_BACKUP') !== false) {
+ $lineNb = $key;
+ }
+ }
+ if (isset($lineNb)) {
+ $explodedLine = explode('|', $explodedFile[$lineNb]);
+ array_shift($explodedLine);
+ foreach ($explodedLine as $table) {
+ if (!empty($table)) {
+ $tablesToSave .= ' -t ' . trim($table);
+ }
}
}
}
--
GitLab