Doctrine

Timestamp:

01/30/08 00:32:36 (17 months ago)

Author:

guilhermeblanco

Message:

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

Files:

• branches/0.10/lib/Doctrine/Task/DropDb.php (modified) (1 diff)
• branches/0.9/lib/Doctrine/Task/DropDb.php (modified) (1 diff)
• trunk/lib/Doctrine/Task/DropDb.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Task/DropDb.php

@@ -35 +35 @@
     public $description          =   'Drop database for all existing connections',
            $requiredArguments    =   array(),
-           $optionalArguments    =   array();
-    
+           $optionalArguments    =   array('force'  =>  'Whether or not to force the drop database task');
+
     public function execute()
     {
-        $answer = $this->ask('Are you sure you wish to drop your databases? (y/n)');
-        
-        if ($answer != 'y') {
-            $this->notify('Successfully cancelled');
-            
-            return;
+        if ( ! $this->getArgument('force')) {
+            $answer = $this->ask('Are you sure you wish to drop your databases? (y/n)');
+
+            if ($answer != 'y') {
+                $this->notify('Successfully cancelled');
+
+                return;
+            }
         }
 
         $results = Doctrine::dropDatabases();
-        
+
         foreach ($results as $dbName => $bool) {
             $msg = $bool ? 'Successfully dropped database named: "' . $dbName . '"':'Could not drop database named: "' .$dbName . '"';
-            
+
             $this->notify($msg);
         }

branches/0.9/lib/Doctrine/Task/DropDb.php

@@ -35 +35 @@
     public $description          =   'Drop database for all existing connections',
            $requiredArguments    =   array(),
-           $optionalArguments    =   array();
-    
+           $optionalArguments    =   array('force'  =>  'Whether or not to force the drop database task');
+
     public function execute()
     {
-        $answer = $this->ask('Are you sure you wish to drop your databases? (y/n)');
-        
-        if ($answer != 'y') {
-            $this->notify('Successfully cancelled');
-            
-            return;
+        if ( ! $this->getArgument('force')) {
+            $answer = $this->ask('Are you sure you wish to drop your databases? (y/n)');
+
+            if ($answer != 'y') {
+                $this->notify('Successfully cancelled');
+
+                return;
+            }
         }
 
         $results = Doctrine::dropDatabases();
-        
+
         foreach ($results as $dbName => $bool) {
             $msg = $bool ? 'Successfully dropped database named: "' . $dbName . '"':'Could not drop database named: "' .$dbName . '"';
-            
+
             $this->notify($msg);
         }

trunk/lib/Doctrine/Task/DropDb.php

@@ -36 +36 @@
            $requiredArguments    =   array(),
            $optionalArguments    =   array('force'  =>  'Whether or not to force the drop database task');
-    
+
     public function execute()
     {
@@ -50 +50 @@
 
         $results = Doctrine::dropDatabases();
-        
+
         foreach ($results as $name => $result) {
             $msg = $result instanceof Exception ? 'Could not drop database for connection: "' .$name . '." Failed with exception: ' . $result->getMessage():$result;
-            
+
             $this->notify($msg);
         }