andela-tolotin / Potato-ORM

src/Exceptions/EmptyArrayException.php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@
 
 class EmptyArrayException extends Exception {
 	
-    public static function checkEmptyArrayException($message)
-    {
-    	return new static($message);
-    }
+	public static function checkEmptyArrayException($message)
+	{
+		return new static($message);
+	}
 
 }

src/Exceptions/NoArgumentPassedToFunctionException.php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@
 
 class NoArgumentPassedToFunctionException extends Exception {
 	
-    public static function checkNoArgumentPassedToFunction($message)
-    {
-    	return new static($message);
-    }
+	public static function checkNoArgumentPassedToFunction($message)
+	{
+		return new static($message);
+	}
 
 }

src/Exceptions/NoRecordInsertionException.php

Indentation +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@
 
 class NoRecordInsertionException extends Exception {
 
-    public static function checkNoRecordAddedException($mesaage)
-    {
-    	return new static($mesaage);
-    }
+	public static function checkNoRecordAddedException($mesaage)
+	{
+		return new static($mesaage);
+	}
 }

src/Exceptions/NoRecordUpdateException.php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@
 
 class NoRecordUpdateException extends  Exception {
 	
-    public static function checkNoRecordUpdateException($message)
-    {
-    	return new static($message);
-    }
+	public static function checkNoRecordUpdateException($message)
+	{
+		return new static($message);
+	}
 
 }

src/Exceptions/WrongArgumentException.php

Indentation +4 added lines, -4 removed lines

@@ -12,9 +12,9 @@
 
 class WrongArgumentException extends Exception {
 
-    public function checkWrongArgumentException($message)
-    {
-    	return new static ($message);
-    }
+	public function checkWrongArgumentException($message)
+	{
+		return new static ($message);
+	}
 
 }

src/Database/DatabaseHelper.php

Indentation +14 added lines, -14 removed lines

@@ -13,25 +13,25 @@
 
 class DatabaseHelper {
 	
-    public $dbConn;
+	public $dbConn;
     
-    /**
-     * This is a constructor; a default method  that will be called automatically during class instantiation
-     */
-    public function __construct($dbConnect)
-    {
-    	$this->dbConn = $dbConnect;
-    }
+	/**
+	 * This is a constructor; a default method  that will be called automatically during class instantiation
+	 */
+	public function __construct($dbConnect)
+	{
+		$this->dbConn = $dbConnect;
+	}
     
-    /**
-     * This method creates a particular table
-     * @param tableName
-     * $return boolean true or false
-     */
+	/**
+	 * This method creates a particular table
+	 * @param tableName
+	 * $return boolean true or false
+	 */
    public function createTable($tableName, $conn = NULL)
    {
    	if (is_null($conn)) {
-   	    $conn = $this->dbConn;
+   		$conn = $this->dbConn;
    	}
    	
    	$sql = 'CREATE TABLE IF NOT EXISTS '.$tableName.'(';

src/Model/BaseModel.php

Doc Comments +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
     /**
      * This method find a record by id
      * @params int id
-     * @return Object
+     * @return BaseClass
      * @throws NoArgumentPassedToFunctionException
      */
     public static function find($id)
@@ -142,7 +142,7 @@ 
    /**
     * This method return the current class name
     * $params void
-    * @return classname
+    * @return string|false
     */
    public static function getClassName()
    {

Indentation +115 added lines, -115 removed lines

@@ -20,124 +20,124 @@ 
 
 class BaseClass  implements InterfaceBaseClass
 {
-    protected $databaseModel; // Private variable that contains instance of database
-    protected $tableName; // Class variable holding class name pluralized
-    protected $properties = []; // Properties will later contain key, value pairs from the magic setter, getter methods
-    use Inflector; // Inject the inflector trait
+	protected $databaseModel; // Private variable that contains instance of database
+	protected $tableName; // Class variable holding class name pluralized
+	protected $properties = []; // Properties will later contain key, value pairs from the magic setter, getter methods
+	use Inflector; // Inject the inflector trait
 
-    public function  __construct()
-    {
-        $this->tableName = $this->getClassName();
-        $this->databaseModel = new DatabaseHandler($this->tableName);
-        $this->properties['id'] = 0;
-    }
+	public function  __construct()
+	{
+		$this->tableName = $this->getClassName();
+		$this->databaseModel = new DatabaseHandler($this->tableName);
+		$this->properties['id'] = 0;
+	}
     
-    /**
-     * The magic getter method
-     * @params key
-     * @return array key
-     */
-    public function __get($key)
-    {
-    	$this->properties[$key];
-    }
+	/**
+	 * The magic getter method
+	 * @params key
+	 * @return array key
+	 */
+	public function __get($key)
+	{
+		$this->properties[$key];
+	}
     
-    /**
-     * The magic setter method
-     * @params property, key
-     * @return array associative array properties
-     */
-    public function  __set($property, $value)
-    {
-    	$this->properties[$property] = $value;
-    }
+	/**
+	 * The magic setter method
+	 * @params property, key
+	 * @return array associative array properties
+	 */
+	public function  __set($property, $value)
+	{
+		$this->properties[$property] = $value;
+	}
     
-    /**
-     * This method gets all the record from a particular table
-     * @params void
-     * @return associative array
-     * @throws NoRecordFoundException
-     */
-    public static function getAll()
-    {
-    	$allData = DatabaseHandler::read($id = false, self::getClassName());
-    	if (count($allData) > 0) {
-    	    return $allData;
-    	}
-    	throw NoRecordFoundException::checkNoRecordFoundException("There is no record to display");
-    }
+	/**
+	 * This method gets all the record from a particular table
+	 * @params void
+	 * @return associative array
+	 * @throws NoRecordFoundException
+	 */
+	public static function getAll()
+	{
+		$allData = DatabaseHandler::read($id = false, self::getClassName());
+		if (count($allData) > 0) {
+			return $allData;
+		}
+		throw NoRecordFoundException::checkNoRecordFoundException("There is no record to display");
+	}
     
-    /**
-     * This method create or update record in a database table
-     * @params void
-     * @return bool true or false;
-     * @throws EmptyArrayException
-     * @throws NoRecordInsertionException
-     * @throws NoRecordUpdateException
-     */
-    public function save()
-    {
-    	$boolCommit = false;
-    	if ($this->properties['id']) {
-    	    $allData = DatabaseHandler::read($id = $this->properties['id'], self::getClassName());
-    	    if ($this->checkIfRecordIsEmpty($allData)) {
-    	    	$boolCommit = $this->databaseModel->update(['id' => $this->properties['id']], $this->tableName, $this->properties);
-    	    	if ($boolCommit) {
-    	    	    return true;
-    	    	}
-    	    	throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
-    	    }
-    	    throw EmptyArrayException::checkEmptyArrayException("Value passed didn't match any record");
-    	}
-    	$boolCommit = $this->databaseModel->create($this->properties, $this->tableName);
-    	if ($boolCommit) {
-    	    return true;
-    	}
-    	throw NoRecordInsertionException::checkNoRecordAddedException("Record not created successfully");
-    }
+	/**
+	 * This method create or update record in a database table
+	 * @params void
+	 * @return bool true or false;
+	 * @throws EmptyArrayException
+	 * @throws NoRecordInsertionException
+	 * @throws NoRecordUpdateException
+	 */
+	public function save()
+	{
+		$boolCommit = false;
+		if ($this->properties['id']) {
+			$allData = DatabaseHandler::read($id = $this->properties['id'], self::getClassName());
+			if ($this->checkIfRecordIsEmpty($allData)) {
+				$boolCommit = $this->databaseModel->update(['id' => $this->properties['id']], $this->tableName, $this->properties);
+				if ($boolCommit) {
+					return true;
+				}
+				throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
+			}
+			throw EmptyArrayException::checkEmptyArrayException("Value passed didn't match any record");
+		}
+		$boolCommit = $this->databaseModel->create($this->properties, $this->tableName);
+		if ($boolCommit) {
+			return true;
+		}
+		throw NoRecordInsertionException::checkNoRecordAddedException("Record not created successfully");
+	}
 
-    /**
-     * This method find a record by id
-     * @params int id
-     * @return Object
-     * @throws NoArgumentPassedToFunctionException
-     */
-    public static function find($id)
-    {
-    	$num_args = (int) func_num_args(); // get number of arguments passed to
-    	if ($num_args == 0 || $num_args > 1) {
-    	    throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
-    	}
-    	if ($id == "") {
-    		throw NullArgumentPassedToFunction::checkNullArgumentPassedToFunction("This function expect a value");
-    	}
-    	$staticFindInstance = new static();
-    	$staticFindInstance->id = $id == "" ? false : $id;
-    	return $staticFindInstance;
+	/**
+	 * This method find a record by id
+	 * @params int id
+	 * @return Object
+	 * @throws NoArgumentPassedToFunctionException
+	 */
+	public static function find($id)
+	{
+		$num_args = (int) func_num_args(); // get number of arguments passed to
+		if ($num_args == 0 || $num_args > 1) {
+			throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
+		}
+		if ($id == "") {
+			throw NullArgumentPassedToFunction::checkNullArgumentPassedToFunction("This function expect a value");
+		}
+		$staticFindInstance = new static();
+		$staticFindInstance->id = $id == "" ? false : $id;
+		return $staticFindInstance;
     	
-    }
+	}
     
-    /**
-     * This method delete a row from the table by the row id
-     * @params int id
-     * @return boolean true or false
-     * @throws NoRecordDeletionException;
-     */
-    public static function destroy($id)
-    {
-    	$boolDeleted = false;
-    	$num_args = (int) func_num_args(); // get number of arguments passed to
+	/**
+	 * This method delete a row from the table by the row id
+	 * @params int id
+	 * @return boolean true or false
+	 * @throws NoRecordDeletionException;
+	 */
+	public static function destroy($id)
+	{
+		$boolDeleted = false;
+		$num_args = (int) func_num_args(); // get number of arguments passed to
     	
-    	if ($num_args == 0 || $num_args > 1) {
-    	    throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
-    	}
-    	$boolDeleted = DatabaseHandler::delete($id, self::getClassName());
-    	if ($boolDeleted) {
-    	    return true;
-    	}
-    	throw NoRecordDeletionException::checkNoRecordUpdateException("Record deletion unsuccessful because id does not match any record");
+		if ($num_args == 0 || $num_args > 1) {
+			throw NoArgumentPassedToFunctionException::checkNoArgumentPassedToFunction("Argument missing: only one argument is allowed");
+		}
+		$boolDeleted = DatabaseHandler::delete($id, self::getClassName());
+		if ($boolDeleted) {
+			return true;
+		}
+		throw NoRecordDeletionException::checkNoRecordUpdateException("Record deletion unsuccessful because id does not match any record");
     	
-    }
+	}
 
    /**
     * This method return the current class name
@@ -156,12 +156,12 @@ 
     * @param $arrayOfRecord
     * @return bool
     */
-    public function checkIfRecordIsEmpty($arrayOfRecord)
-    {
-    	if (count($arrayOfRecord) > 0) {
-    	    return true;
-    	}
-    	return false;
-    }
+	public function checkIfRecordIsEmpty($arrayOfRecord)
+	{
+		if (count($arrayOfRecord) > 0) {
+			return true;
+		}
+		return false;
+	}
 
 }

src/Interface/InterfaceBaseClass.php

Indentation +6 added lines, -6 removed lines

@@ -10,12 +10,12 @@
 
 interface InterfaceBaseClass {
 
-    /**
-     * This method gets all the record from a particular table
-     * @params void
-     * @return associative array
-     */
-    public static function getAll();
+	/**
+	 * This method gets all the record from a particular table
+	 * @params void
+	 * @return associative array
+	 */
+	public static function getAll();
    
    /**
     * This method create or update record in a database table

src/Database/DatabaseHandler.php

Doc Comments +7 added lines, -1 removed lines

@@ -21,6 +21,7 @@ 
     
     /**
      * This is a constructor; a default method  that will be called automatically during class instantiation
+     * @param string|false $modelClassName
      */
      public function __construct($modelClassName, $dbConn = Null)
      {
@@ -35,6 +36,7 @@ 
     /**
      * This method create a record and store it in a table row
      * @params associative array, string tablename
+     * @param string|false $tableName
      * @return boolean true or false
      */
     public function create($associative1DArray, $tableName, $dbConn = Null)
@@ -69,6 +71,7 @@ 
     /**
      * This method updates any table by supplying 3 parameter
      * @params: $updateParams, $tableName, $associative1DArray
+     * @param string|false $tableName
      * @return boolean true or false
      */
     public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = Null)
@@ -101,6 +104,7 @@ 
   /**
    * This method retrieves record from a table
    * @params int id, string tableName
+   * @param string|false $tableName
    * @return array
    */
    public static function read($id, $tableName, $dbConn = Null)
@@ -131,6 +135,7 @@ 
   /**
    * This method deletes a record  from a table row
    * @params int id, string tableName
+   * @param string|false $tableName
    * @return boolean true or false
    */
   public static function delete($id, $tableName, $dbConn = Null)
@@ -163,7 +168,7 @@ 
   
   /**
    * This method returns sql query
-   * @param $sql
+   * @param string $sql
    * @return string
    */
   public function prepareUpdateQuery($sql)
@@ -204,6 +209,7 @@ 
    * This method returns column fields of a particular table
    * @param $table
    * @param $conn
+   * @param DatabaseConnection $dbConn
    * @return array
    */
  public function getColumnNames($table, $dbConn = Null) {

Indentation +144 added lines, -144 removed lines

@@ -18,105 +18,105 @@ 
 use Laztopaz\potatoORM\NoRecordUpdateException;
 
 class DatabaseHandler {
-    private $tableFields;
-    private $dbHelperInstance;
-    private $dbConnection;
-    private $model;
+	private $tableFields;
+	private $dbHelperInstance;
+	private $dbConnection;
+	private $model;
     
-    /**
-     * This is a constructor; a default method  that will be called automatically during class instantiation
-     */
-    public function __construct($modelClassName, $dbConn = Null) {
-        if (is_null($dbConn)) {
-            $this->dbConnection = new DatabaseConnection();
-          } else {
-            $this->dbConnection = $dbConn;
-          }
-          $this->model = $modelClassName;
-     }
+	/**
+	 * This is a constructor; a default method  that will be called automatically during class instantiation
+	 */
+	public function __construct($modelClassName, $dbConn = Null) {
+		if (is_null($dbConn)) {
+			$this->dbConnection = new DatabaseConnection();
+		  } else {
+			$this->dbConnection = $dbConn;
+		  }
+		  $this->model = $modelClassName;
+	 }
      
-    /**
-     * This method create a record and store it in a table row
-     * @params associative array, string tablename
-     * @return boolean true or false
-     */
-    public function create($associative1DArray, $tableName, $dbConn = Null) {
-    	$tableFields = $this->getColumnNames($this->model, $this->dbConnection);
-    	$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields,$associative1DArray);
-    	if (count($unexpectedFields) > 0) {
-    	    throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields,"needs to be created as table field");
-    	}
-      unset($associative1DArray[0]);
-    	if (is_null($dbConn)) {
-    	    $dbConn = $this->dbConnection;
-    	}
-    	  return $this->insertRecord($dbConn, $tableName, $associative1DArray);
-    }
+	/**
+	 * This method create a record and store it in a table row
+	 * @params associative array, string tablename
+	 * @return boolean true or false
+	 */
+	public function create($associative1DArray, $tableName, $dbConn = Null) {
+		$tableFields = $this->getColumnNames($this->model, $this->dbConnection);
+		$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields,$associative1DArray);
+		if (count($unexpectedFields) > 0) {
+			throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields,"needs to be created as table field");
+		}
+	  unset($associative1DArray[0]);
+		if (is_null($dbConn)) {
+			$dbConn = $this->dbConnection;
+		}
+		  return $this->insertRecord($dbConn, $tableName, $associative1DArray);
+	}
     
-    /**
-     * This method runs the insertion query
-     * @param  $dbConn           
-     * @param  $tableName          
-     * @param  $associative1DArray 
-     * @return boolean true         
-     */
-    private function  insertRecord($dbConn, $tableName, $associative1DArray) {
-    	$insertQuery = 'INSERT INTO '.$tableName;
-    	$TableValues = implode(',',array_keys($associative1DArray));
-    	foreach ($associative1DArray as $field => $value) {
-    	    $FormValues[] = "'".trim(addslashes($value))."'";
-    	}
-    	$splittedTableValues = implode(',', $FormValues);
-    	$insertQuery.= ' ('.$TableValues.')';
-    	$insertQuery.= ' VALUES ('.$splittedTableValues.')';
-    	$executeQuery = $dbConn->exec($insertQuery);
-
-      if ($executeQuery) {
-        return true;
-      }
-      return false;
-
-    	throw NoRecordInsertionException::checkNoRecordAddedException("Record not inserted successfully");
-    }
-
-    /**
-     * This method updates any table by supplying 3 parameter
-     * @params: $updateParams, $tableName, $associative1DArray
-     * @return boolean true or false
-     */
-    public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = Null)
-    {
-    	$sql = "";
-    	if (is_null($dbConn)) {
-    	    $dbConn = $this->dbConnection;
-    	}
-    	$updateSql = "UPDATE `$tableName` SET ";
-    	unset($associative1DArray['id']);
-    	$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->getColumnNames($this->model, $this->dbConnection),$associative1DArray);
+	/**
+	 * This method runs the insertion query
+	 * @param  $dbConn           
+	 * @param  $tableName          
+	 * @param  $associative1DArray 
+	 * @return boolean true         
+	 */
+	private function  insertRecord($dbConn, $tableName, $associative1DArray) {
+		$insertQuery = 'INSERT INTO '.$tableName;
+		$TableValues = implode(',',array_keys($associative1DArray));
+		foreach ($associative1DArray as $field => $value) {
+			$FormValues[] = "'".trim(addslashes($value))."'";
+		}
+		$splittedTableValues = implode(',', $FormValues);
+		$insertQuery.= ' ('.$TableValues.')';
+		$insertQuery.= ' VALUES ('.$splittedTableValues.')';
+		$executeQuery = $dbConn->exec($insertQuery);
+
+	  if ($executeQuery) {
+		return true;
+	  }
+	  return false;
+
+		throw NoRecordInsertionException::checkNoRecordAddedException("Record not inserted successfully");
+	}
+
+	/**
+	 * This method updates any table by supplying 3 parameter
+	 * @params: $updateParams, $tableName, $associative1DArray
+	 * @return boolean true or false
+	 */
+	public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = Null)
+	{
+		$sql = "";
+		if (is_null($dbConn)) {
+			$dbConn = $this->dbConnection;
+		}
+		$updateSql = "UPDATE `$tableName` SET ";
+		unset($associative1DArray['id']);
+		$unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->getColumnNames($this->model, $this->dbConnection),$associative1DArray);
   
-    	if (count($unexpectedFields) > 0) {
-    		throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields, "needs to be created as table field");
-    	}
-    	foreach($associative1DArray as $field => $value) {
-    	    $sql .= "`$field` = '$value'".",";
-    	}
+		if (count($unexpectedFields) > 0) {
+			throw TableFieldUndefinedException::reportUnknownTableField($unexpectedFields, "needs to be created as table field");
+		}
+		foreach($associative1DArray as $field => $value) {
+			$sql .= "`$field` = '$value'".",";
+		}
     	
-    	$updateSql .= $this->prepareUpdateQuery($sql);
+		$updateSql .= $this->prepareUpdateQuery($sql);
     	
-    	foreach ($updateParams as $key => $val) {
-    	    $updateSql .= " WHERE $key = $val";
-    	}
-    	$stmt = $dbConn->prepare($updateSql);
+		foreach ($updateParams as $key => $val) {
+			$updateSql .= " WHERE $key = $val";
+		}
+		$stmt = $dbConn->prepare($updateSql);
 
-    	$boolResponse = $stmt->execute();
+		$boolResponse = $stmt->execute();
 
-      if ($boolResponse) {
-         return true;
-      }
-      return false;
+	  if ($boolResponse) {
+		 return true;
+	  }
+	  return false;
 
-      throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
-    }
+	  throw NoRecordUpdateException::checkNoRecordUpdateException("Record not updated successfully");
+	}
     
   /**
    * This method retrieves record from a table
@@ -128,22 +128,22 @@ 
    	$tableData = [];
    	
    	if (is_null($dbConn)) {
-   	    $dbConn = new DatabaseConnection();
+   		$dbConn = new DatabaseConnection();
    	}
    	$sql = $id  ? 'SELECT * FROM '.$tableName.' WHERE id = '.$id : 'SELECT * FROM '.$tableName;
    	
    	try {
-   	    $stmt = $dbConn->prepare($sql);
-   	    $stmt->bindValue(':table', $tableName);
-   	    $stmt->bindValue(':id', $id);
-   	    $stmt->execute();
+   		$stmt = $dbConn->prepare($sql);
+   		$stmt->bindValue(':table', $tableName);
+   		$stmt->bindValue(':id', $id);
+   		$stmt->execute();
    	} catch (PDOException $e) {
-   	    return  $e->getMessage();
+   		return  $e->getMessage();
    	}
    	$results = $stmt->fetchAll(PDO::FETCH_ASSOC);
    	
    	foreach($results as $result) {
-   	    array_push($tableData, $result);
+   		array_push($tableData, $result);
    	}
    	return $tableData;
    }
@@ -155,20 +155,20 @@ 
    */
   public static function delete($id, $tableName, $dbConn = Null)
   {
-      if (is_null($dbConn)) {
-          $dbConn = new DatabaseConnection();
-      }
+	  if (is_null($dbConn)) {
+		  $dbConn = new DatabaseConnection();
+	  }
 
-      $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
+	  $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
 
-      $boolResponse = $dbConn->exec($sql);
+	  $boolResponse = $dbConn->exec($sql);
 
-      if ($boolResponse) {
+	  if ($boolResponse) {
 
-        return true;
-      }
+		return true;
+	  }
 
-      throw NoRecordDeletionException::checkNoRecordDeleteException("Record not deleted successfully");
+	  throw NoRecordDeletionException::checkNoRecordDeleteException("Record not deleted successfully");
   }
   
   /**
@@ -179,13 +179,13 @@ 
    */
   public static function checkIfMagicSetterContainsIsSameAsClassModel(array $tableColumn, array $userSetterArray)
   {
-      $unexpectedFields = [];
-      foreach ($userSetterArray as $key => $val) {
-          if (!in_array($key,$tableColumn)) {
-              $unexpectedFields[] = $key;
-          }
-      }
-      return $unexpectedFields;
+	  $unexpectedFields = [];
+	  foreach ($userSetterArray as $key => $val) {
+		  if (!in_array($key,$tableColumn)) {
+			  $unexpectedFields[] = $key;
+		  }
+	  }
+	  return $unexpectedFields;
   }
   
   /**
@@ -195,10 +195,10 @@ 
    */
   public function prepareUpdateQuery($sql)
   {
-      $splittedQuery = explode(",",$sql);
-      array_pop($splittedQuery);
-      $mergeData = implode(",",$splittedQuery);
-      return $mergeData;
+	  $splittedQuery = explode(",",$sql);
+	  array_pop($splittedQuery);
+	  $mergeData = implode(",",$splittedQuery);
+	  return $mergeData;
   }
   
   /**
@@ -210,21 +210,21 @@ 
    */
   public function findAndWhere($params, $tableName, $dbConn = Null)
   {
-      if (is_null($dbConn)) {
-          $dbConn = $this->dbConnection;
-      }
-      if (is_array($params) && !empty($params)) {
-          $sql = "SELECT * FROM ".$tableName;
-          foreach ($params as $key => $val) {
-              $sql .= " WHERE `$key` = '$val'";
-          }
-          $statement = $dbConn->prepare($sql);
-          $statement->execute();
-          $returnedRowNumbers = $statement->rowCount();
+	  if (is_null($dbConn)) {
+		  $dbConn = $this->dbConnection;
+	  }
+	  if (is_array($params) && !empty($params)) {
+		  $sql = "SELECT * FROM ".$tableName;
+		  foreach ($params as $key => $val) {
+			  $sql .= " WHERE `$key` = '$val'";
+		  }
+		  $statement = $dbConn->prepare($sql);
+		  $statement->execute();
+		  $returnedRowNumbers = $statement->rowCount();
           
-          return $returnedRowNumbers  ? true : false;
-      }
-      throw EmptyArrayException::checkEmptyArrayException("Array Expected: parameter passed to this function is not an array");
+		  return $returnedRowNumbers  ? true : false;
+	  }
+	  throw EmptyArrayException::checkEmptyArrayException("Array Expected: parameter passed to this function is not an array");
   }
   
   /**
@@ -234,22 +234,22 @@ 
    * @return array
    */
  public function getColumnNames($table, $dbConn = Null) {
-     $tableFields = [];
+	 $tableFields = [];
      
-     if (is_null($dbConn)) {
-         $dbConn = $this->dbConnection;
-     }
-     $sql = "SHOW COLUMNS FROM ".$table;
+	 if (is_null($dbConn)) {
+		 $dbConn = $this->dbConnection;
+	 }
+	 $sql = "SHOW COLUMNS FROM ".$table;
      
-     $stmt = $dbConn->prepare($sql);
-     $stmt->bindValue(':table', $table, PDO::PARAM_STR);
-     $stmt->execute();
-     $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+	 $stmt = $dbConn->prepare($sql);
+	 $stmt->bindValue(':table', $table, PDO::PARAM_STR);
+	 $stmt->execute();
+	 $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
      
-     foreach($results as $result) {
-         array_push($tableFields, $result['Field']);
-     }
-     return $tableFields;
+	 foreach($results as $result) {
+		 array_push($tableFields, $result['Field']);
+	 }
+	 return $tableFields;
  }
 
 }