Doctrine

Timestamp:

01/29/08 23:19:20 (17 months ago)

Author:

guilhermeblanco

Message:

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

Files:

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

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

@@ -37 +37 @@
                                            'dql_query' => 'Specify the complete dql query to execute.'),
            $optionalArguments    =   array();
-    
+
     public function execute()
     {
         Doctrine::loadModels($this->getArgument('models_path'));
-        
+
         $dql = $this->getArgument('dql_query');
-        
+
         $query = new Doctrine_Query();
-        
-        $this->notify('executing: "' . $dql . '"');
-        
-        $results = $query->query($dql);
-        
+
+        $params = explode(',', $this->getArgument('params'));
+
+        $this->notify('executing: "' . $dql . '" (' . implode(', ', $params) . ')');
+
+        $results = $query->query($dql, $params);
+
         $this->_printResults($results);
     }
-    
+
     protected function _printResults($data)
     {
         $array = $data->toArray(true);
-        
+
         $yaml = Doctrine_Parser::dump($array, 'yml');
         $lines = explode("\n", $yaml);
-        
+
         unset($lines[0]);
         $lines[1] = $data->getTable()->getOption('name') . ':';
-        
+
         foreach ($lines as $yamlLine) {
             $line = trim($yamlLine);
-            
+
             if ($line) {
                 $this->notify($yamlLine);

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

@@ -41 +41 @@
     {
         Doctrine::loadModels($this->getArgument('models_path'));
-        
+
         $dql = $this->getArgument('dql_query');
-        
+
         $query = new Doctrine_Query();
-        
-        $this->notify('executing: "' . $dql . '"');
-        
-        $results = $query->query($dql);
-        
+
+        $params = explode(',', $this->getArgument('params'));
+
+        $this->notify('executing: "' . $dql . '" (' . implode(', ', $params) . ')');
+
+        $results = $query->query($dql, $params);
+
         $this->_printResults($results);
     }
-    
+
     protected function _printResults($data)
     {
         $array = $data->toArray(true);
-        
+
         $yaml = Doctrine_Parser::dump($array, 'yml');
         $lines = explode("\n", $yaml);
-        
+
         unset($lines[0]);
         $lines[1] = $data->getTable()->getOption('name') . ':';
-        
+
         foreach ($lines as $yamlLine) {
             $line = trim($yamlLine);
-            
+
             if ($line) {
                 $this->notify($yamlLine);

trunk/lib/Doctrine/Task/Dql.php

@@ -49 +49 @@
 
         $this->notify('executing: "' . $dql . '" (' . implode(', ', $params) . ')');
-        
+
         $results = $query->query($dql, $params);