Commit e1580c40 authored by guilhermeblanco's avatar guilhermeblanco

Merged changeset #3588 into 0.9 and 0.10 branches. Fixed ws in trunk

parent 6b484334
...@@ -35,7 +35,7 @@ class Doctrine_Task_DropDb extends Doctrine_Task ...@@ -35,7 +35,7 @@ class Doctrine_Task_DropDb extends Doctrine_Task
public $description = 'Drop database for all existing connections', public $description = 'Drop database for all existing connections',
$requiredArguments = array(), $requiredArguments = array(),
$optionalArguments = array('force' => 'Whether or not to force the drop database task'); $optionalArguments = array('force' => 'Whether or not to force the drop database task');
public function execute() public function execute()
{ {
if ( ! $this->getArgument('force')) { if ( ! $this->getArgument('force')) {
...@@ -49,10 +49,10 @@ class Doctrine_Task_DropDb extends Doctrine_Task ...@@ -49,10 +49,10 @@ class Doctrine_Task_DropDb extends Doctrine_Task
} }
$results = Doctrine::dropDatabases(); $results = Doctrine::dropDatabases();
foreach ($results as $name => $result) { foreach ($results as $name => $result) {
$msg = $result instanceof Exception ? 'Could not drop database for connection: "' .$name . '." Failed with exception: ' . $result->getMessage():$result; $msg = $result instanceof Exception ? 'Could not drop database for connection: "' .$name . '." Failed with exception: ' . $result->getMessage():$result;
$this->notify($msg); $this->notify($msg);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment