fernando/luos
1
0
Fork 0
Code Releases Activity

Cosmetic changes to the upgrade messages.

Browse Source
This commit is contained in:
Alexandre Rosenfeld
2011-03-10 14:36:40 +00:00
parent 2d2bb75ee1
commit 7e94491aa9
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/class.wsTools.php
View File

@@ -418,11 +418,11 @@ class workspaceTools {
$currentUserIsSuper = true; $currentUserIsSuper = true;
} }
CLI::logging("Creating table"); CLI::logging("-> Creating table\n");
//now check if table APPCACHEVIEW exists, and it have correct number of fields, etc. //now check if table APPCACHEVIEW exists, and it have correct number of fields, etc.
$res = $appCache->checkAppCacheView(); $res = $appCache->checkAppCacheView();
CLI::logging(", triggers"); CLI::logging("-> Creating triggers\n");
//now check if we have the triggers installed //now check if we have the triggers installed
$triggers = array(); $triggers = array();
$triggers[] = $appCache->triggerAppDelegationInsert($lang, $checkOnly); $triggers[] = $appCache->triggerAppDelegationInsert($lang, $checkOnly);
@@ -430,10 +430,9 @@ class workspaceTools {
$triggers[] = $appCache->triggerApplicationUpdate($lang, $checkOnly); $triggers[] = $appCache->triggerApplicationUpdate($lang, $checkOnly);
$triggers[] = $appCache->triggerApplicationDelete($lang, $checkOnly); $triggers[] = $appCache->triggerApplicationDelete($lang, $checkOnly);
CLI::logging(", filling cache view"); CLI::logging("-> Filling cache view\n");
//build using the method in AppCacheView Class //build using the method in AppCacheView Class
$res = $appCache->fillAppCacheView($lang); $res = $appCache->fillAppCacheView($lang);
CLI::logging(".\n");
//set status in config table //set status in config table
$confParams = Array( $confParams = Array(
'LANG' => $lang, 'LANG' => $lang,
@@ -497,18 +496,21 @@ class workspaceTools {
count($changes['tablesWithNewIndex']) > 0 || count($changes['tablesWithNewIndex']) > 0 ||
count($changes['tablesToAlterIndex']) > 0); count($changes['tablesToAlterIndex']) > 0);
if ($checkOnly || (!$changed)) { if ($checkOnly || (!$changed)) {
if ($changed) if ($changed) {
return $changes; return $changes;
else } else {
CLI::logging("-> Nothing to change\n");
return $changed; return $changed;
} }
}
$oDataBase = $this->getDatabase(); $oDataBase = $this->getDatabase();
$oDataBase->iFetchType = MYSQL_NUM; $oDataBase->iFetchType = MYSQL_NUM;
$oDataBase->logQuery ( count ($changes ) ); $oDataBase->logQuery ( count ($changes ) );
CLI::logging( "" . count($changes['tablesToAdd']) . " tables to add"); if (!empty($changes['tablesToAdd']))
CLI::logging( "-> " . count($changes['tablesToAdd']) . " tables to add\n");
foreach ($changes['tablesToAdd'] as $sTable => $aColumns) { foreach ($changes['tablesToAdd'] as $sTable => $aColumns) {
$oDataBase->executeQuery($oDataBase->generateCreateTableSQL($sTable, $aColumns)); $oDataBase->executeQuery($oDataBase->generateCreateTableSQL($sTable, $aColumns));
if (isset($changes['tablesToAdd'][$sTable]['INDEXES'])) { if (isset($changes['tablesToAdd'][$sTable]['INDEXES'])) {
@@ -518,7 +520,8 @@ class workspaceTools {
} }
} }
CLI::logging(", " . count($changes['tablesToAlter']) . " tables to alter"); if (!empty($changes['tablesToAlter']))
CLI::logging("-> " . count($changes['tablesToAlter']) . " tables to alter\n");
foreach ($changes['tablesToAlter'] as $sTable => $aActions) { foreach ($changes['tablesToAlter'] as $sTable => $aActions) {
foreach ($aActions as $sAction => $aAction) { foreach ($aActions as $sAction => $aAction) {
foreach ($aAction as $sColumn => $vData) { foreach ($aAction as $sColumn => $vData) {
@@ -537,21 +540,22 @@ class workspaceTools {
} }
} }
CLI::logging(", " . count($changes['tablesWithNewIndex']) . " indexes to add"); if (!empty($changes['tablesWithNewIndex']))
CLI::logging("-> " . count($changes['tablesWithNewIndex']) . " indexes to add\n");
foreach ($changes['tablesWithNewIndex'] as $sTable => $aIndexes) { foreach ($changes['tablesWithNewIndex'] as $sTable => $aIndexes) {
foreach ($aIndexes as $sIndexName => $aIndexFields ) { foreach ($aIndexes as $sIndexName => $aIndexFields ) {
$oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields )); $oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields ));
} }
} }
CLI::logging(", " . count($changes['tablesWithNewIndex']) . " indexes to alter"); if (!empty($changes['tablesToAlterIndex']))
CLI::logging("-> " . count($changes['tablesToAlterIndex']) . " indexes to alter\n");
foreach ($changes['tablesToAlterIndex'] as $sTable => $aIndexes) { foreach ($changes['tablesToAlterIndex'] as $sTable => $aIndexes) {
foreach ($aIndexes as $sIndexName => $aIndexFields ) { foreach ($aIndexes as $sIndexName => $aIndexFields ) {
$oDataBase->executeQuery($oDataBase->generateDropKeySQL($sTable, $sIndexName )); $oDataBase->executeQuery($oDataBase->generateDropKeySQL($sTable, $sIndexName ));
$oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields )); $oDataBase->executeQuery($oDataBase->generateAddKeysSQL($sTable, $sIndexName, $aIndexFields ));
} }
} }
CLI::logging("\n");
$this->closeDatabase(); $this->closeDatabase();
return true; return true;
} }
@@ -658,7 +662,7 @@ class workspaceTools {
* *
* @param bool $printSysInfo include sys info as well or not * @param bool $printSysInfo include sys info as well or not
*/ */
public function printMetadata($printSysInfo = true, $fields = NULL) { public function printMetadata($printSysInfo = true) {
if ($printSysInfo) { if ($printSysInfo) {
workspaceTools::printSysInfo (); workspaceTools::printSysInfo ();
CLI::logging("\n"); CLI::logging("\n");