Merge pull request #24 from andela-iadeniyi/1.0.0

Update the where clause
ibonly · Mar 7, 2016 · edf4b9e · edf4b9e
2 parents 62fed00 + 1ae5876
commit edf4b9e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Database/DatabaseQuery.php b/src/Database/DatabaseQuery.php
@@ -228,7 +228,7 @@ public static function whereAndClause($tableName, $data, $condition)
      *
      * @return string
      */
-    public static function selectQuery($tableName, $data, $condition, $connection)
+    public static function selectQuery($tableName, $fields, $data, $condition, $connection)
     {
         $query = "";
         try
@@ -241,7 +241,7 @@ public static function selectQuery($tableName, $data, $condition, $connection)
             else
             {
                 $columnName = self::whereAndClause($tableName, $data, $condition);
-                $query =  "SELECT * FROM $tableName WHERE $columnName";
+                $query =  "SELECT $fields FROM $tableName WHERE $columnName";
             }
         } catch ( PDOException $e ) {
             $query = $e->getMessage();

diff --git a/src/Helper/Model.php b/src/Helper/Model.php
@@ -134,7 +134,7 @@ public function where($data, $condition = NULL, $dbConnection = NULL)
         $databaseQuery = new DatabaseQuery();
         $connection = $databaseQuery->checkConnection($dbConnection);
 
-        $sqlQuery = $databaseQuery->selectQuery(self::getTableName($connection), $data, $condition, $connection);
+        $sqlQuery = $databaseQuery->selectQuery(self::getTableName($connection), self::fields(), $data, $condition, $connection);
         $query = $connection->prepare($sqlQuery);
         $query->execute();
         if ( $query->rowCount() )
@@ -154,7 +154,7 @@ public static function find($value, $dbConnection = NULL)
     {
         $connection = DatabaseQuery::checkConnection($dbConnection);
 
-        $sqlQuery = DatabaseQuery::selectQuery(self::getTableName($connection), ['id' => $value], NULL, $connection);
+        $sqlQuery = DatabaseQuery::selectQuery(self::getTableName($connection), self::fields(), ['id' => $value], NULL, $connection);
         $query = $connection->prepare($sqlQuery);
         $query->execute();
         if ( $query->rowCount() )

diff --git a/src/Interface/DatabaseQueryInterface.php b/src/Interface/DatabaseQueryInterface.php
@@ -15,7 +15,7 @@ public function checkTableExist($table, $con=NULL);
 
     public static function checkTableName($table, $dbConnection=NULL);
 
-    public static function selectQuery($tableName, $field, $value, $connection);
+    public static function selectQuery($tableName, $fields, $data, $condition, $connection);
 
     public static function whereAndClause($tableName, $data, $condition);
 

diff --git a/test/DatabaseQueryTest.php b/test/DatabaseQueryTest.php
@@ -45,6 +45,6 @@ public function testSelectQuery()
         $this->dbConnectionMocked = Mockery::mock('\Ibonly\PotatoORM\DBConfig');
         $this->statement = Mockery::mock('\PDOStatement');
 
-        $this->assertInternalType("string", $this->databaseQuery->selectQuery('users' , [],NULL, $this->dbConnectionMocked));
+        $this->assertInternalType("string", $this->databaseQuery->selectQuery('users' , '*', [],NULL, $this->dbConnectionMocked));
     }
 }