set alias for querying

Signed-off-by: Derek Smart <derek@grindaga.com>

Author: mcred

src/Model.php

@@ -3,30 +3,38 @@
 
 abstract class Model extends PHPRed
 {
+    private $alias;
+
     public $model;
     public $table;
     public $primaryKey;
 
     public function __construct(\mysqli $mysqli)
     {
+        $this->setAlias();
         parent::__construct($mysqli);
     }
 
+    private function setAlias()
+    {
+        $this->alias = $this->table . ' ' . $this->model;
+    }
+
     public function getAll() : array
     {
-        $query = "SELECT * FROM $this->table;";
+        $query = "SELECT $this->model.* FROM $this->alias;";
         return $this->query($query);
     }
 
     public function getById(int $modelId) : array
     {
-        $query = "SELECT * FROM $this->table WHERE $this->primaryKey = $modelId;";
+        $query = "SELECT $this->model.* FROM $this->alias WHERE $this->model.$this->primaryKey = $modelId;";
         return $this->query($query);
     }
 
     public function get() : array
     {
-        $query = "SELECT * FROM $this->table ";
+        $query = "SELECT $this->model.* FROM $this->alias";
         $query .= $this->conditions;
         $query .= $this->order;
         return $this->query($query);

src/PHPRed.php

@@ -16,6 +16,7 @@ public function __construct(\mysqli $mysqli)
 
     protected function query(string $query) : array
     {
+        echo PHP_EOL . $query . PHP_EOL;
         $results = $this->mysqli->query($query);
         if ($this->mysqli->errno) {
             throw new \Exception($this->mysqli->error . $query);
@@ -31,26 +32,26 @@ protected function query(string $query) : array
 
     public function orderBy(array $args)
     {
-        $order = 'ORDER BY ';
+        $order = ' ORDER BY ';
         foreach ($args as $key => $value) {
             $key = $this->mysqli->escape_string($key);
             $value = $this->mysqli->escape_string($value);
-            $order .= '`' . $key . '` ' . strtoupper($value) . ' ';
+            $order .= $this->model . '.`' . $key . '` ' . strtoupper($value) . ', ';
         }
-        $this->order = trim($order);
+        $this->order = rtrim(substr($order, 0, -2));
         return $this;
     }
 
 
     public function where(array $args, string $method = 'AND')
     {
-        $search = 'WHERE ';
+        $search = ' WHERE ';
         foreach ($args as $key => $value) {
             $key = $this->mysqli->escape_string($key);
             $value = $this->mysqli->escape_string($value);
-            $search .= '`' . $key . '` = "' . $value . '" ' . $method;
+            $search .= $this->model . '.`' . $key . '` = "' . $value . '" ' . $method;
         }
-        $this->conditions .= trim(substr($search, 0, -strlen($method)));
+        $this->conditions .= rtrim(substr($search, 0, -strlen($method)));
         return $this;
     }
 }