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

Fix conflicts after merge with develop, more conflictst

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2019-07-04 14:56:52 -04:00
parent 416093f698 9f2a543c2d
commit ee92390937
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1379,4 +1379,4 @@ function check_queries_incompatibilities($wsName)
} else { } else {
echo ">> No MySQL 5.7 incompatibilities in variables found for this workspace." . PHP_EOL; echo ">> No MySQL 5.7 incompatibilities in variables found for this workspace." . PHP_EOL;
} }
} }

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

@@ -264,7 +264,7 @@ class WorkspaceTools
$start = microtime(true); $start = microtime(true);
$this->checkMafeRequirements($workspace, $lang); $this->checkMafeRequirements($workspace, $lang);
CLI::logging("* End checking MAFE requirements...(Completed on " . (microtime(true) - $start) . " seconds)\n"); CLI::logging("* End checking MAFE requirements...(Completed on " . (microtime(true) - $start) . " seconds)\n");
CLI::logging("* Start deleting MySQL triggers: " . implode(', ', self::$triggers) . "...\n"); CLI::logging("* Start deleting MySQL triggers: " . implode(', ', self::$triggers) . "...\n");
$start = microtime(true); $start = microtime(true);
$this->deleteTriggersMySQL(self::$triggers); $this->deleteTriggersMySQL(self::$triggers);
@@ -2149,7 +2149,6 @@ class WorkspaceTools
$workspace->upgradeSchema($systemSchema); $workspace->upgradeSchema($systemSchema);
CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n"); CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
/*----------------------------------********---------------------------------*/
CLI::logging("* Start migrating to new list tables...\n"); CLI::logging("* Start migrating to new list tables...\n");
$start = microtime(true); $start = microtime(true);
$workspace->migrateList(true, $lang); $workspace->migrateList(true, $lang);