fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged release/3.4.0 into bugfix/PMC-1054

Browse Source
This commit is contained in:
Paula Quispe
2019-08-14 11:46:35 -04:00
parent ba32d7ca69 42ae4ad7ff
commit edadedb8d4
3 changed files with 268 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -625,6 +625,7 @@ function database_upgrade($args)
foreach ($workspaces as $workspace) {
try {
$workspace->upgradeDatabase();
$workspace->close();
} catch (Exception $e) {
G::outRes("> Error: " . CLI::error($e->getMessage()) . "\n");
}

76
workflow/engine/classes/WorkspaceTools.php
View File

@@ -1354,7 +1354,6 @@ class WorkspaceTools
// Ending the schema update
CLI::logging("-> Schema Updated\n");
$this->closeDatabase();
return true;
}
@@ -2562,40 +2561,22 @@ class WorkspaceTools
throw new Exception($errorMessage);
}
// Clean the queries array
$listQueries = [];
// Canceled List
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_CANCELED'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListUsrId('LIST_CANCELED'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_CANCELED'));
// Inbox List
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_INBOX'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListUsrId('LIST_INBOX'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_INBOX'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListAppStatusId('LIST_INBOX'));
// Participated List
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_PARTICIPATED_LAST'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListUsrId('LIST_PARTICIPATED_LAST'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_PARTICIPATED_LAST'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListAppStatusId('LIST_PARTICIPATED_LAST'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListParticipatedLastCurrentUser());
// Unassigned List
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListProId('LIST_UNASSIGNED'));
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->updateListTasId('LIST_UNASSIGNED'));
// Updating PRO_ID field
$this->runUpdateListField(['LIST_CANCELED', 'LIST_INBOX', 'LIST_PARTICIPATED_LAST', 'LIST_UNASSIGNED'], 'updateListProId');
// Run queries in multiple threads for update the list tables
$processesManager = new ProcessesManager($listQueries);
$processesManager->run();
// Updating TAS_ID field
$this->runUpdateListField(['LIST_CANCELED', 'LIST_INBOX', 'LIST_PARTICIPATED_LAST', 'LIST_UNASSIGNED'], 'updateListTasId');
// If exists an error throw an exception
if (!empty($processesManager->getErrors())) {
$errorMessage = '';
foreach ($processesManager->getErrors() as $error) {
$errorMessage .= $error['rawAnswer'] . PHP_EOL;
}
throw new Exception($errorMessage);
}
// Updating USR_ID field
$this->runUpdateListField(['LIST_CANCELED', 'LIST_INBOX', 'LIST_PARTICIPATED_LAST'], 'updateListUsrId');
// Updating APP_STATUS_ID field
$this->runUpdateListField(['LIST_INBOX', 'LIST_PARTICIPATED_LAST'], 'updateListAppStatusId');
// Updating Last Current User Information
$this->runUpdateListField(['LIST_PARTICIPATED_LAST'], 'updateListParticipatedLastCurrentUser');
// Updating flags for the list population
$this->listFirstExecution('insert');
$this->listFirstExecution('insert', 'unassigned');
}
@@ -2986,6 +2967,37 @@ class WorkspaceTools
$stmt->executeQuery($this->updateListTasId('LIST_UNASSIGNED'));
}
/**
* Run the update queries for the specified tables
*
* @param array $listTables
* @param string $methodName
*
* @throws Exception
*/
public function runUpdateListField(array $listTables, $methodName) {
// Clean the queries array
$listQueries = [];
// Get the queries
foreach ($listTables as $listTable) {
$listQueries[] = new RunProcessUpgradeQuery($this->name, $this->$methodName($listTable));
}
// Run queries in multiple threads for update the list tables
$processesManager = new ProcessesManager($listQueries);
$processesManager->run();
// If exists an error throw an exception
if (!empty($processesManager->getErrors())) {
$errorMessage = '';
foreach ($processesManager->getErrors() as $error) {
$errorMessage .= $error['rawAnswer'] . PHP_EOL;
}
throw new Exception($errorMessage);
}
}
/**
* Return query to update PRO_ID in list table
*