From a81e1d766f8745aeb2ae799b1189d92dfd6ae3eb Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Fri, 15 Dec 2006 23:07:01 +0000
Subject: [PATCH] added leftJoin and innerJoin methods

---
 lib/Doctrine/Query.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index 5ddf0d71e..fa24a8dc6 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -273,9 +273,9 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
 
         foreach($names as $name) {
             if($count == 0) {
-                $this->parts["select"][] = $tablename . '.' . $name;
+                $this->parts['select'][] = $tablename . '.' . $name;
             } else {
-                $this->parts["select"][] = $tablename . '.' . $name . ' AS ' . $tablename . '__' . $name;
+                $this->parts['select'][] = $tablename . '.' . $name . ' AS ' . $tablename . '__' . $name;
             }
         }
     }
@@ -285,10 +285,30 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
      * @param strint $from
      */
     public function addFrom($from) {
-        $class = "Doctrine_Query_From";
+        $class = 'Doctrine_Query_From';
         $parser = new $class($this);
         $parser->parse($from);
     }
+    /**
+     * leftJoin
+     *
+     * @param strint $join
+     */
+    public function leftJoin($join) {
+        $class = 'Doctrine_Query_From';
+        $parser = new $class($this);
+        $parser->parse('LEFT JOIN '. $join);
+    }
+    /**
+     * innerJoin
+     *
+     * @param strint $join
+     */
+    public function innerJoin($join) {
+        $class = 'Doctrine_Query_From';
+        $parser = new $class($this);
+        $parser->parse('INNER JOIN '. $join);
+    }
     /**
      * addWhere
      *
@@ -296,7 +316,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
      * @param mixed $params
      */
     public function addWhere($where, $params = array()) {
-        $class  = "Doctrine_Query_Where";
+        $class  = 'Doctrine_Query_Where';
         $parser = new $class($this);
         $this->parts['where'][] = $parser->parse($where);