Merge branch 'master' of github.com:usmanhalalit/pixie

Author: Muhammad Usman

README.md

@@ -317,7 +317,7 @@ QB::table('my_table')
 
 ### Group By and Order By
 ```PHP
-$query = QB::table('my_table')->groupBy('age')->orderBy('created_at');
+$query = QB::table('my_table')->groupBy('age')->orderBy('created_at', 'ASC');
 ```
 
 #### Multiple Group By

src/Pixie/QueryBuilder/Adapters/BaseAdapter.php

@@ -364,7 +364,6 @@ protected function buildCriteria($statements, $bindValues = true)
         $criteria = '';
         $bindings = array();
         foreach ($statements as $statement) {
-
             $key = $this->wrapSanitizer($statement['key']);
             $value = $statement['value'];
 
@@ -408,7 +407,7 @@ protected function buildCriteria($statements, $bindValues = true)
                         break;
                 }
             } elseif ($value instanceof Raw) {
-                $criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value";
+                $criteria .= "{$statement['joiner']} {$key} {$statement['operator']} $value ";
             } else {
                 // Usual where like criteria
 

src/Pixie/QueryBuilder/QueryBuilderHandler.php

@@ -320,7 +320,6 @@ private function doInsert($data, $type)
         // If first value is not an array
         // Its not a batch insert
         if (!is_array(current($data))) {
-
             $queryObject = $this->getQuery($type, $data);
 
             list($result, $executionTime) = $this->statement($queryObject->getSql(), $queryObject->getBindings());
@@ -331,7 +330,6 @@ private function doInsert($data, $type)
             $return = array();
             $executionTime = 0;
             foreach ($data as $subData) {
-
                 $queryObject = $this->getQuery($type, $subData);
 
                 list($result, $time) = $this->statement($queryObject->getSql(), $queryObject->getBindings());

tests/Pixie/QueryBuilderBehaviorTest.php

@@ -126,11 +126,12 @@ public function testSelectQueryWithNestedCriteriaAndJoins()
             ->leftJoin(array('person_details', 'b'), function($table) use ($builder)
                 {
                     $table->on('b.person_id', '=', 'my_table.id');
+                    $table->on('b.deleted', '=', $builder->raw(0));
                     $table->orOn('b.age', '>', $builder->raw(1));
                 })
         ;
 
-        $this->assertEquals("SELECT * FROM `cb_my_table` INNER JOIN `cb_person_details` AS `cb_a` ON `cb_a`.`person_id` = `cb_my_table`.`id` LEFT JOIN `cb_person_details` AS `cb_b` ON `cb_b`.`person_id` = `cb_my_table`.`id` OR `cb_b`.`age` > 1 WHERE `cb_my_table`.`id` > 1 OR `cb_my_table`.`id` = 1 AND (`value` LIKE '%sana%' OR (`key` LIKE '%sana%' OR `value` LIKE '%sana%'))"
+        $this->assertEquals("SELECT * FROM `cb_my_table` INNER JOIN `cb_person_details` AS `cb_a` ON `cb_a`.`person_id` = `cb_my_table`.`id` LEFT JOIN `cb_person_details` AS `cb_b` ON `cb_b`.`person_id` = `cb_my_table`.`id` AND `cb_b`.`deleted` = 0 OR `cb_b`.`age` > 1 WHERE `cb_my_table`.`id` > 1 OR `cb_my_table`.`id` = 1 AND (`value` LIKE '%sana%' OR (`key` LIKE '%sana%' OR `value` LIKE '%sana%'))"
             , $query->getQuery()->getRawSql());
     }