Doctrine

Timestamp:

03/08/08 04:39:48 (16 months ago)

Author:

jwage

Message:

fixes #821

Location:

branches/0.10

Files:

• lib/Doctrine/Query.php (modified) (4 diffs)
• lib/Doctrine/Query/Abstract.php (modified) (1 diff)
• tests/QueryTestCase.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Query.php

@@ -506 +506 @@
         // check for wildcards
         if (in_array('*', $fields)) {
-            //echo "<br />";Doctrine::dump($table->getColumnNames()); echo "<br />";
             $fields = $table->getFieldNames();
         } else {
@@ -537 +536 @@
 
         $this->_neededTables[] = $tableAlias;
-        //Doctrine::dump(implode(', ', $sql));
-        //echo "<br /><br />";
+        
         return implode(', ', $sql);
     }
@@ -1847 +1845 @@
      * Copies a Doctrine_Query object.
      *
-     * @param Doctrine_Query   Doctrine query instance.
-     *                         If ommited the instance itself will be used as source.
      * @return Doctrine_Query  Copy of the Doctrine_Query instance.
      */
@@ -1860 +1856 @@
 
         return $new;
+    }
+
+    /**
+     * __clone
+     *
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->_parsers = array();
     }
 

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

@@ -456 +456 @@
     public function removeSqlQueryPart($name)
     {
-        try {
         if ( ! isset($this->_sqlParts[$name])) {
             throw new Doctrine_Query_Exception('Unknown query part ' . $name);
-        }}
-        catch (Exception $e) {echo $e->getTraceAsString(); echo "<br /><br /><br />";}
-
+        }
+        
         if ($name == 'limit' || $name == 'offset') {
-                $this->_sqlParts[$name] = false;
+            $this->_sqlParts[$name] = false;
         } else {
-                $this->_sqlParts[$name] = array();
-        }
+            $this->_sqlParts[$name] = array();
+        }
+        
         return $this;
     }

branches/0.10/tests/QueryTestCase.php

@@ -112 +112 @@
         $this->assertTrue($q->count(), 1);
     }
+    
+    public function testQueryCopyClone()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*')->from('User u');
+        $sql = $query->getSql();
+        
+        $data = $query->execute();
+        $query2 = $query->copy();
+        
+        $this->assertTrue($sql, $query2->getSql());
+        
+        $query2->limit(0);
+        $query2->offset(0);
+        $query2->select('COUNT(u.id) as nb');
+        
+        $this->assertTrue($query2->getSql(), 'SELECT COUNT(e.id) AS e__0 FROM entity e WHERE (e.type = 0)');
+    }
 }
 class MyQuery extends Doctrine_Query