14

Author: megawilddaddy

SimplePDOQueryBuilder.php

@@ -33,7 +33,10 @@ class SimplePDOQueryBuilder
      * @var
      */
     protected $alias;
-
+    /**
+     * @var int
+     */
+    protected $joinOrd = 0;
     /**
      * @var array
      */
@@ -127,16 +130,6 @@ public function subQuery($alias)
         return $sq;
     }
 
-    /**
-     * @param $alias
-     * @return $this
-     */
-    public function setAlias($alias)
-    {
-        $this->alias = $alias;
-        return $this;
-    }
-
     /**
      * @param $from
      * @return $this
@@ -154,6 +147,65 @@ public function from($from)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getSql()
+    {
+        $query = "\n SELECT " . implode(',', $this->fields);
+
+        if (!empty($this->from)) {
+            $query .= "\n FROM " . $this->from;
+        }
+        if (!empty($this->joins)) {
+            $query .= implode(' ', $this->joins);
+        }
+        if (!empty($this->where)) {
+            $query .= "\n WHERE " . implode(" AND ", $this->where);
+        }
+        if (!empty($this->groupBy)) {
+            $query .= "\n GROUP BY $this->groupBy ";
+        }
+        if (!empty($this->having)) {
+            $query .= "\n HAVING " . implode(" AND ", $this->having);
+        }
+        if (!empty($this->sortBy)) {
+            $query .= "\n ORDER BY $this->sortBy $this->sortOrder ";
+        }
+        if ($this->limit) {
+            $query .= "\n LIMIT $this->limit";
+            if ($this->offset) {
+                $query .= " OFFSET " . $this->offset;
+            }
+        }
+
+        if (!empty($this->union)) {
+            $query .= implode(' ', $this->union);
+        }
+
+        $query .= "\n";
+
+        return $query;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    /**
+     * @param $alias
+     * @return $this
+     */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+        return $this;
+    }
+
     /**
      * @param $leftJoin
      * @param string $condition
@@ -162,10 +214,14 @@ public function from($from)
     public function leftJoin($leftJoin, $condition = '')
     {
         if ($leftJoin instanceof SimplePDOQueryBuilder) {
-            $this->leftJoins[] = "\n LEFT JOIN ( {$leftJoin->getSql()} ) as {$leftJoin->getAlias()} ON $condition";
+            $join = "\n LEFT JOIN ( {$leftJoin->getSql()} ) as {$leftJoin->getAlias()} ON $condition";
         } else {
-            $this->leftJoins[] = "\n LEFT JOIN " . $leftJoin . ($condition ? ' ON ' . $condition : '');
+            $join = "\n LEFT JOIN " . $leftJoin . ($condition ? ' ON ' . $condition : '');
         }
+
+        $this->joinOrd++;
+        $this->joins[$this->joinOrd] = $join;
+
         return $this;
     }
 
@@ -177,17 +233,22 @@ public function leftJoin($leftJoin, $condition = '')
     public function join($join, $condition = '')
     {
         if ($join instanceof SimplePDOQueryBuilder) {
-            $this->joins[] = "\n JOIN ( {$join->getSql()} ) as {$join->getAlias()} ON $condition";
+            $join = "\n JOIN ( {$join->getSql()} ) as {$join->getAlias()} ON $condition";
         } else {
-            $this->joins[] = "\n JOIN " . $join . ($condition ? ' ON ' . $condition : '');
+            $join = "\n JOIN " . $join . ($condition ? ' ON ' . $condition : '');
         }
+
+        $this->joinOrd++;
+        $this->joins[$this->joinOrd] = $join;
+
         return $this;
     }
 
+
     /**
      * @param $join
-     * @internal param string $condition
      * @return $this
+     * @internal param string $condition
      */
     public function union($join)
     {
@@ -209,21 +270,13 @@ public function where($condition)
         return $this;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getAlias()
-    {
-        return $this->alias;
-    }
-
     /**
      * @param $having
      * @return $this
      */
     public function having($having)
     {
-        $this->having []= $having;
+        $this->having [] = $having;
         return $this;
     }
 
@@ -249,50 +302,6 @@ public function orderBy($sortBy, $sortOrder = 'DESC')
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getSql()
-    {
-        $query = "\n SELECT " . implode(',', $this->fields);
-
-        if (!empty($this->from)) {
-            $query .= "\n FROM " . $this->from;
-        }
-        if (!empty($this->joins)) {
-            $query .= implode(' ', $this->joins);
-        }
-        if (!empty($this->leftJoins)) {
-            $query .= implode(' ', $this->leftJoins);
-        }
-        if (!empty($this->where)) {
-            $query .= "\n WHERE " . implode(" AND ", $this->where);
-        }
-        if (!empty($this->groupBy)) {
-            $query .= "\n GROUP BY $this->groupBy ";
-        }
-        if (!empty($this->having)) {
-            $query .= "\n HAVING " . implode(" AND ", $this->having);
-        }
-        if (!empty($this->sortBy)) {
-            $query .= "\n ORDER BY $this->sortBy $this->sortOrder ";
-        }
-        if ($this->limit) {
-            $query .= "\n LIMIT $this->limit";
-            if ($this->offset) {
-                $query .= " OFFSET " . $this->offset;
-            }
-        }
-
-        if (!empty($this->union)) {
-            $query .= implode(' ', $this->union);
-        }
-
-        $query .= "\n";
-
-        return $query;
-    }
-
     /**
      *
      */
@@ -306,7 +315,11 @@ public function resetHaving()
      */
     public function resetLeftJoins()
     {
-        $this->leftJoins = [];
+        if (!empty($this->leftJoins)) {
+            foreach ($this->leftJoins as $ord) {
+                unset($this->joins[$ord]);
+            }
+        }
     }
 
     /**
@@ -348,14 +361,6 @@ public function addParameter($k, $v)
         $this->parameters[$k] = $v;
     }
 
-    /**
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
     public function dump()
     {
         $sql = $this->getSql();
@@ -365,6 +370,14 @@ public function dump()
         die("<pre>" . $sql . "</pre>");
     }
 
+    /**
+     * @return array
+     */
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
+
     /**
      * @return array
      */

composer.json

@@ -4,7 +4,7 @@
     "description": "Simple PDO Query Builder",
     "keywords": ["pdo", "query builder"],
     "license": "MIT",
-    "version": "1.3.3",
+    "version": "1.4",
     "authors": [
         {
             "name": "Vasily Sokolov",