Doctrine

Timestamp:

06/08/08 17:59:34 (13 months ago)

Author:

guilhermeblanco

Message:

Fixes 1116. Actually it is a PHP bug that was only solved in 6 march 2008. So only possible release to have this fixed is using PHP 5.2.6. Please refer to  http://bugs.php.net/bug.php?id=40417 for more explanation. I updated the test case to be sure we are correctly passing things to MySQL. Updated Query and QueryAbstract? to use getParams as they should. Also, getParams only displays the correct number of params after preQuery event. SoftDelete? binds new values only after processing DQL (which is done calling getSql()), so getParams only has the right values after it.

Location:

branches/0.11

Files:

• lib/Doctrine/Query.php (modified) (1 diff)
• lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• tests/Ticket/1116TestCase.php (modified) (3 diffs)

branches/0.11/lib/Doctrine/Query.php

@@ -288 +288 @@
     }
 
-    /**
-     * getParams
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return array_merge($this->_params['join'], $this->_params['set'], $this->_params['where'], $this->_params['having']);
-    }
-
-    /**
-     * setParams
-     *
-     * @param array $params
-     */
-    public function setParams(array $params = array()) {
-        $this->_params = $params;
-    }
 
     /**

branches/0.11/lib/Doctrine/Query/Abstract.php

@@ -501 +501 @@
 
     /**
+     * getParams
+     *
+     * @return array
+     */
+    public function getParams($params = array())
+    {
+        return array_merge($this->_params['join'], $this->_params['set'], $this->_params['where'], $this->_params['having'], $params);
+    }
+
+    /**
+     * setParams
+     *
+     * @param array $params
+     */
+    public function setParams(array $params = array()) {
+        $this->_params = $params;
+    }
+
+    /**
      * setView
      * sets a database view this query object uses
@@ -968 +987 @@
         }
 
-        $params = array_merge($this->_params['join'],
-                              $this->_params['set'],
-                              $this->_params['where'],
-                              $this->_params['having'],
-                              $params);
+        $params = $this->getParams($params);
 
         if ($this->_resultCache && $this->_type == self::SELECT) {

branches/0.11/tests/Ticket/1116TestCase.php

@@ -7 +7 @@
                 $this->dbh = new Doctrine_Adapter_Mock('mysql');
                 //$this->dbh = new PDO("mysql:host=localhost;dbname=testing", 'root', 'password');
-                  
+
                 $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
                 $this->conn->export->exportClasses(array('Ticket_1116_User'));
         }
+
+
         public function testTicket()
         {
@@ -17 +19 @@
                   ->from('Ticket_1116_User s')
                   ->where('s.username = ?', array('test'));
-                  
+
                 // to see the error switch dbh to a real db, the next line will trigger the error
                 $test = $q->fetchOne();  //will only fail with "real" mysql 
-                $this->assertFalse($test);                
-                          
+                $this->assertFalse($test);
+
                 $sql    = $q->getSql(); // just getSql()?!?! and it works ? the params are ok after this call  
-                $params = $q->getParams();       
-                $this->assertEqual(count($params),2); // now we have array('test',null) very strange ..... 
-                 
+                $params = $q->getParams();
+                $this->assertEqual(count($params), 2); // now we have array('test',null) very strange ..... 
+
+                $this->assertEqual($sql, "SELECT u.id AS u__id, u.username AS u__username, u.deleted AS u__deleted FROM user u WHERE u.username = ? AND u.deleted = ?");
+                $this->assertEqual($params, array('test', false));
+
                 //now also this works! (always works witch mock only fails with mysql)
                 $test = $q->fetchOne();
-                $this->assertFalse($test);           
+                $this->assertFalse($test);
         }
 }
 
+
 class Ticket_1116_User extends Doctrine_Record
 {
-  public function setTableDefinition()
+        public function setTableDefinition()
         {
                 $this->setTableName('user');
@@ -40 +46 @@
                 $this->hasColumn('username', 'string', 255);
         }
+
+
         public function setUp()
         {