From 4fece2d6844c2a4db39b5b7eec0a28d8152ecee9 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 24 Jul 2020 12:08:09 +0200
Subject: [PATCH] FEAT #14249 TIME 0:20 Minor update
---
.../controllers/VersionUpdateController.php | 31 +++++++++++++------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/app/versionUpdate/controllers/VersionUpdateController.php b/src/app/versionUpdate/controllers/VersionUpdateController.php
index 0cda3d9a4a0..1ca67fcfe25 100755
--- a/src/app/versionUpdate/controllers/VersionUpdateController.php
+++ b/src/app/versionUpdate/controllers/VersionUpdateController.php
@@ -27,8 +27,6 @@ use SrcCore\models\ValidatorModel;
class VersionUpdateController
{
- const BACKUP_TABLES = ['usergroups_services', 'groupbasket'];
-
public function get(Request $request, Response $response)
{
if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_update_control', 'userId' => $GLOBALS['id']])) {
@@ -165,10 +163,10 @@ class VersionUpdateController
$minorVersion = $availableMinorVersions[0];
$output = [];
-// exec('git status --porcelain --untracked-files=no 2>&1', $output);
-// if (!empty($output)) {
-// return $response->withStatus(400)->withJson(['errors' => 'Some files are modified. Can not update application', 'lang' => 'canNotUpdateApplication']);
-// }
+ exec('git status --porcelain --untracked-files=no 2>&1', $output);
+ if (!empty($output)) {
+ return $response->withStatus(400)->withJson(['errors' => 'Some files are modified. Can not update application', 'lang' => 'canNotUpdateApplication']);
+ }
$minorVersions = explode('.', $minorVersion);
$currentVersionTag = (int)$currentVersionTag;
@@ -244,11 +242,26 @@ class VersionUpdateController
$actualTime = date("dmY-His");
$tablesToSave = '';
- foreach (self::BACKUP_TABLES as $table) {
- $tablesToSave .= ' -t ' . $table;
+ foreach ($args['sqlFiles'] as $sqlFile) {
+ $fileContent = file_get_contents($sqlFile);
+ $explodedFile = explode("\n", $fileContent);
+ 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);
+ }
+ }
+ }
}
- $execReturn = exec("pg_dump -d \"{$config['database'][0]['name']}\" {$tablesToSave} -a > \"{$directoryPath}/migration/backupDB_maarchcourrier_{$actualTime}.sql\"", $output, $intReturn);
+ $execReturn = exec("pg_dump --dbname=\"postgresql://{$config['database'][0]['user']}:{$config['database'][0]['password']}@{$config['database'][0]['server']}:{$config['database'][0]['port']}/{$config['database'][0]['name']}\" {$tablesToSave} -a > \"{$directoryPath}/migration/backupDB_maarchcourrier_{$actualTime}.sql\"", $output, $intReturn);
if (!empty($execReturn)) {
return ['errors' => 'Pg dump failed : ' . $execReturn];
}
--
GitLab