Using Join with Clauses Error Fixed.

Author: Fredrick Peter

README.md

@@ -110,7 +110,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/php-orm-database": "^4.1.2"
+    "peterson/php-orm-database": "^4.1.3"
 }
 ```
 
@@ -853,14 +853,14 @@ SELECT *
 </details>
 
 ### join
-<details><summary>Read more...</summary>
 
 | Params        |  Description      |
 |---------------|-------------------|
 | table         |  table            |
 | foreignColumn |  table.column     |
 | operator      |  operator sign    |
-| localColumn   | local_table.column |
+| localColumn   | local_table.column|
+
 ```
 $db->table('wallet')
     ->join('users', 'users.user_id', '=', 'wallet.user_id')
@@ -871,22 +871,33 @@ SELECT *
     FROM `wallet`
     INNER JOIN `users` ON users.user_id = wallet.user_id
 ```
-</details>
 
-### leftJoin
-<details><summary>Read more...</summary>
+- or
+    - When using clauses, Make sure `join`|`leftJoin` comes first, Before the clauses
+```
+$db->table('wallet')
+    ->join('users', 'users.user_id', '=', 'wallet.user_id')
+    ->where('wallet.email', 'example.com')
+    ->orWhere('wallet.user_id', 10000001)
+    ->paginate(10);
+
+-- Query
+SELECT * 
+    FROM `wallet`
+    INNER JOIN `users` ON users.user_id = wallet.user_id
+    WHERE wallet.email =:email OR wallet.user_id =:user_id 
+    LIMIT 0, 10
+```
 
+### leftJoin
 - Same as `join`
+
 ```
 $db->table('wallet')
     ->leftJoin('users', 'users.user_id', '=', 'wallet.user_id')
+    ->where('wallet.email', 'example.com')
     ->get();
-
-SELECT * 
-    FROM `wallet`
-    LEFT JOIN `users` ON users.user_id = wallet.user_id
 ```
-</details>
 
 ### where
 - Takes three parameter

composer.json

@@ -38,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.1.2-dev"
+            "dev-main": "4.1.3-dev"
         }
     },
     "minimum-stability": "stable",

src/Query/Builder.php

@@ -233,23 +233,24 @@ public function where($column, $operator = null, $value = null)
         $temp       = $this->console::configWhereClauseOperator($operator, $value);
         $value      = $temp['value'];
         $operator   = $temp['operator'];
+        $query      = $this->whereAndOrWhereQuery($column, $operator);
 
         // if query already exists
         if($this->isWhereExist()){
             $this->where[] = [
-                'query' => " AND {$column}{$operator}:{$column}",
+                'query' => " AND {$query['query']}",
                 'data'  => [
-                    'column'    => $column,
+                    'column'    => $query['column'],
                     'operator'  => $operator,
                     'value'     => $value,
                 ]
             ];
         }else{
             // first query
             $this->where[] = [
-                'query' => " WHERE {$column}{$operator}:{$column}",
+                'query' => " WHERE {$query['query']}",
                 'data'  => [
-                    'column'    => $column,
+                    'column'    => $query['column'],
                     'operator'  => $operator,
                     'value'     => $value,
                 ]
@@ -279,12 +280,13 @@ public function orWhere($column, $operator = null, $value = null)
         $temp       = $this->console::configWhereClauseOperator($operator, $value);
         $value      = $temp['value'];
         $operator   = $temp['operator'];
+        $query      = $this->whereAndOrWhereQuery($column, $operator);
 
         // or Where query add
         $this->where[] = [
-            'query' => " OR {$column}{$operator}:{$column}",
+            'query' => " OR {$query['query']}",
             'data'  => [
-                'column'    => $column,
+                'column'    => $query['column'],
                 'operator'  => $operator,
                 'value'     => $value,
             ]
@@ -612,6 +614,40 @@ public function select(?array $columns = [])
         return $this;
     }
 
+    /**
+     * Create Where|orWhere Query
+     * @param string $column
+     * @param string $operator
+     * 
+     * @return array
+     * - query|column
+     */ 
+    private function whereAndOrWhereQuery($column, $operator = null)
+    {
+        $columnString = $column;
+        if($this->isJoinExist()){
+            $columnString = substr($column, strpos($column, ".") + 1);
+            $query = "{$column}{$operator}:{$columnString}";
+        } else{
+            $query = "{$column}{$operator}:{$column}";
+        }
+
+        return [
+            'query'     => $query,
+            'column'    => $columnString,
+        ];
+    }
+
+    /**
+     * Check if join exist
+     * 
+     * @return bool
+     */ 
+    private function isJoinExist()
+    {
+        return is_array($this->joins) && count($this->joins) > 0;
+    }
+
     /**
      * Check if Raw or Where clause already exist
      *