changes

Author: hardeepvicky

Join.php

@@ -3,7 +3,7 @@
 
 class Join
 {
-    public $join_type, $primary_field, $table, $alias, $foreign_field, $fields = array();
+    public $join_type, $primary_field, $table, $alias, $foreign_field, $wh, $fields = array(), $joins = array();
 
     public function __construct($join_type, $primary_field, $table, $alias, $foreign_field)
     {
@@ -19,6 +19,18 @@ public static function init($join_type, $primary_field, $table, $alias, $foreign
         return new Join($join_type, $primary_field, $table, $alias, $foreign_field);
     }
 
+    public function join(Join $join)
+    {
+        $this->joins[] = $join;
+        return $this;
+    }
+    
+    public function noField()
+    {
+        $this->fields = null;
+        return $this;
+    }
+    
     public function field($field, $alias = "")
     {
         if (!$alias)
@@ -35,16 +47,54 @@ public function getFields()
         $fields = array();
 
         $table_alias = $this->alias ? $this->alias : $this->table;
-        foreach($this->fields as  $ailas => $field)
+        
+        if (is_array($this->fields))
         {
-            $fields[] = $table_alias . "." . $field . " AS " . $table_alias . "__" . $ailas;
+            if (empty($this->fields))
+            {
+                $fields[] = "$table_alias.*";
+            }
+            else
+            {
+                foreach($this->fields as $ailas => $field)
+                {
+                    $fields[] = $table_alias . "." . $field . " AS " . $table_alias . "__" . $ailas;
+                }
+            }
         }
 
-        if (!$fields)
+        foreach($this->joins as $join)
         {
-            $fields[] = "$table_alias.*";
+            $fields = array_merge($fields, $join->getFields());
         }
 
         return $fields;
     }
+    
+    public function setWhere(Where $wh)
+    {
+        $this->wh = $wh;
+        return $this;
+    }
+    
+    public function get($table_alias)
+    {
+        if (is_null($this->wh))
+        {
+            $this->wh = new Where("AND");
+        }
+        
+        $join_table_alias = $this->alias ? $this->alias : $this->table;
+        
+        $this->wh->add($table_alias . "." . $this->primary_field, $join_table_alias . "." . $this->foreign_field , "=", "");
+        
+        $q = $this->join_type . " " . $this->table . " AS " . $join_table_alias . " ON " . $this->wh->get();
+        
+        foreach($this->joins as $join)
+        {
+            $q .= $join->get($join_table_alias);
+        }
+        
+        return $q;
+    }
 }

Query.php

@@ -47,12 +47,11 @@ public function get()
         if (!$fields)
         {
             $fields[] = "$table_alias.*";
-            
         }
 
         foreach($this->joins as $join)
         {
-            $fields = array_merge($fields, $join["join"]->getFields());
+            $fields = array_merge($fields, $join->getFields());
         }
 
         $fields = implode(", ", $fields);
@@ -61,7 +60,7 @@ public function get()
 
         foreach($this->joins as $join)
         {
-            $str = $this->getJoin($join["join"], $join["where"]);
+            $str = $join->get($table_alias);
 
             if ($str)
             {
@@ -90,30 +89,10 @@ public function get()
         return $q . $wh . $order . ";";
     }
 
-    public function join(Join $join, Where $wh = null)
+    public function join(Join $join)
     {
-        $this->joins[] = array(
-            "join" => $join,
-            "where" => $wh
-        );
+        $this->joins[] = $join;
 
         return $this;
     }
-    
-    public function getJoin(Join $join, Where $wh = null)
-    {
-        if (is_null($wh))
-        {
-            $wh = new Where("AND");
-        }
-        
-        $table_alias = $this->alias ? $this->alias : $this->table;
-        $other_table_alias = $join->alias ? $join->alias : $join->table;
-        
-        $wh->add($table_alias . "." . $join->primary_field, $other_table_alias . "." . $join->foreign_field , "=", "");
-        
-        $q = $join->join_type . " " . $join->table . " AS " . $other_table_alias . " ON " . $wh->get();
-        
-        return $q;
-    }
 }

test.php

@@ -3,9 +3,24 @@
 require_once './Where.php';
 require_once './Join.php';
 
-$qb = new \QueryBuilder\QuerySelect("orders");
+$qb = new \QueryBuilder\QuerySelect("legder_sales", "Legder");
 
 $qb->field("id");
-$qb->join(\QueryBuilder\Join::init("INNER JOIN", "id", "order_details", "OD", "order_id")->field("product_id")->field);
+$qb->join(\QueryBuilder\Join::init("INNER JOIN", "legder_voucher_type_id", "legder_voucher_types", "LegderVoucherType", "id"));
+
+$legder_detail_join = \QueryBuilder\Join::init("LEFT JOIN", "id", "legder_sale_details", "LegderDetail", "legder_sale_id")->noField();
+
+$product_join = \QueryBuilder\Join::init("LEFT JOIN", "product_id", "products", "Product", "id");
+$product_join->join(
+        \QueryBuilder\Join::init("LEFT JOIN", "id", "product_files", "ProductFile", "product_id")->noField()
+        ->join(\QueryBuilder\Join::init("LEFT JOIN", "image_id", "images", "ProductFileImage", "id"))
+);
+
+$product_join->join(\QueryBuilder\Join::init("LEFT JOIN", "category_id", "categories", "Category", "id")->field("name"));
+
+$legder_detail_join->join($product_join);
+$legder_detail_join->join(\QueryBuilder\Join::init("LEFT JOIN", "item_id", "items", "Item", "id"));
+
+$qb->join($legder_detail_join);
 
 echo $qb->get();