Doctrine

Timestamp:

02/20/08 01:30:50 (17 months ago)

Author:

jwage

Message:

Fixed incorrect test case and issue with DQL params.

Location:

branches/0.10

Files:

• lib/Doctrine/Task/Dql.php (modified) (1 diff)
• tests/Import/MssqlTestCase.php (modified) (1 diff)

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

@@ -47 +47 @@
 
         $params = $this->getArgument('params');
-        $params = $params ? explode(',', $params):null;
+        $params = $params ? explode(',', $params):array();
 
         $this->notify('executing: "' . $dql . '" (' . implode(', ', $params) . ')');
 
-        $results = $query->query($dql);
+        $results = $query->query($dql, $params, Doctrine::HYDRATE_ARRAY);
 
         $this->_printResults($results);
     }
 
-    protected function _printResults($data)
+    protected function _printResults($array)
     {
-        $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) {

branches/0.10/tests/Import/MssqlTestCase.php

@@ -50 +50 @@
         $this->import->listTables();
         
-        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name");
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE type = 'U' AND name <> 'dtproperties' ORDER BY name");
     }
     public function testListTriggersExecutesSql()