From bbf247345615aa3fdb0db694775ac44130f143bc Mon Sep 17 00:00:00 2001 From: norahmollo Date: Wed, 5 Nov 2014 09:34:49 -0400 Subject: [PATCH 1/3] PM-837 Restauracion de un ws no realiza database-upgrade Validacion para BD existentes. --- workflow/engine/classes/class.wsTools.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index c277dbb99..72401cc2c 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1552,6 +1552,13 @@ class workspaceTools foreach ($metadata->databases as $db) { if ($dbName != $newDBNames[$db->name]) { $dbName = $newDBNames[$db->name]; + + if (mysql_select_db($db->name, $link)) { + if(!$overwrite) { + throw new Exception("Destination Database already exist (use -o to overwrite)"); + } + } + CLI::logging("+> Restoring database {$db->name} to $dbName\n"); $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql",$aParameters); $workspace->createDBUser($dbName, $db->pass, "localhost", $dbName); From 1ab54615c48c6ba9cc11664385dbe38ebf93db66 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 5 Nov 2014 09:52:17 -0400 Subject: [PATCH 2/3] Improvement enterprise features remove (local) --- workflow/engine/templates/enterprise/addonsStore.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js index 0b4449647..7550019e9 100644 --- a/workflow/engine/templates/enterprise/addonsStore.js +++ b/workflow/engine/templates/enterprise/addonsStore.js @@ -1415,8 +1415,6 @@ Ext.onReady(function() { renderer: function (val, metadata, record, rowIndex, colIndex, store) { if (record.get('release_type') == 'beta') { return val + " (Beta)"; - } else if (record.get('release_type') == 'localRegistry') { - return val + " (Local)"; } else { return val; } From d493851ec5eadfbf93e07f737f0cecf2e6f44d34 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Wed, 5 Nov 2014 12:02:02 -0400 Subject: [PATCH 3/3] PM-837 restauracion de un ws no realiza database-upgrade Validacion para Bases de Datos existentes. --- workflow/engine/classes/class.wsTools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 72401cc2c..5f27d5d4d 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1553,7 +1553,7 @@ class workspaceTools if ($dbName != $newDBNames[$db->name]) { $dbName = $newDBNames[$db->name]; - if (mysql_select_db($db->name, $link)) { + if (mysql_select_db($dbName, $link)) { if(!$overwrite) { throw new Exception("Destination Database already exist (use -o to overwrite)"); }