andela-tolotin / Potato-ORM

src/Database/DatabaseConnection.php

Indentation +61 added lines, -61 removed lines

@@ -14,73 +14,73 @@
 
 class DatabaseConnection extends \PDO {
 	
-    private $databaseName;
-    private $databaseHost;
-    private $databaseDriver;
-    private $databaseUsername;
-    private $databasePassword;
+	private $databaseName;
+	private $databaseHost;
+	private $databaseDriver;
+	private $databaseUsername;
+	private $databasePassword;
     
-    public  function  __construct() 
-    {
-    	$this->loadEnv(); // load the environment variables
-    	$this->databaseName     =  getenv('databaseName');
-    	$this->databaseHost     =  getenv('databaseHost');
-    	$this->databaseDriver   =  getenv('databaseDriver');
-    	$this->databaseUsername =  getenv('databaseUsername');
-    	$this->databasePassword =  getenv('databasePassword');
+	public  function  __construct() 
+	{
+		$this->loadEnv(); // load the environment variables
+		$this->databaseName     =  getenv('databaseName');
+		$this->databaseHost     =  getenv('databaseHost');
+		$this->databaseDriver   =  getenv('databaseDriver');
+		$this->databaseUsername =  getenv('databaseUsername');
+		$this->databasePassword =  getenv('databasePassword');
     	
-    	try {
-    	    $options = [
-    	    	PDO::ATTR_PERSISTENT    => true,
-    	    	PDO::ATTR_ERRMODE       => PDO::ERRMODE_EXCEPTION
-                ];
-    	    	parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);
+		try {
+			$options = [
+				PDO::ATTR_PERSISTENT    => true,
+				PDO::ATTR_ERRMODE       => PDO::ERRMODE_EXCEPTION
+				];
+				parent::__construct($this->getDatabaseDriver(), $this->databaseUsername, $this->databasePassword, $options);
     		
-    	} catch(PDOException $e) {
-    	    return $e->getMessage();
-    	}
+		} catch(PDOException $e) {
+			return $e->getMessage();
+		}
     	
-    }
+	}
 
-    /**
-     * This method determines the driver to be used for appropriate database server
-     * @params void
-     * @return string dsn
-     */
-     public function getDatabaseDriver()
-     {
-     	$dsn = "";
+	/**
+	 * This method determines the driver to be used for appropriate database server
+	 * @params void
+	 * @return string dsn
+	 */
+	 public function getDatabaseDriver()
+	 {
+	 	$dsn = "";
      	
-     	switch ($this->databaseDriver)
-     	{
-            case 'mysql':
-     	    // Set DSN
-     	    $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;
-     	    break;
-     	    case 'sqlite':
-     	    // Set DSN
-     	    $dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName;
-     	    break;
-     	    case 'pgsql':
-     	    // Set DSN
-     	    $dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName;
-     	    break;
-     	    default:
-     	    // Set DSN
-     	    $dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;
-     	}
-     	return $dsn;
-     }
+	 	switch ($this->databaseDriver)
+	 	{
+			case 'mysql':
+	 		// Set DSN
+	 		$dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;
+	 		break;
+	 		case 'sqlite':
+	 		// Set DSN
+	 		$dsn = 'sqlite:host='.$this->databaseHost.';dbname='. $this->databaseName;
+	 		break;
+	 		case 'pgsql':
+	 		// Set DSN
+	 		$dsn = 'pgsqlsql:host='.$this->databaseHost.';dbname='. $this->databaseName;
+	 		break;
+	 		default:
+	 		// Set DSN
+	 		$dsn = 'mysql:host='.$this->databaseHost.';dbname='. $this->databaseName;
+	 	}
+	 	return $dsn;
+	 }
 
-     /**
-      * Load Dotenv to grant getenv() access to environment variables in .env file
-      */
-     public function loadEnv()
-     {
-     	if (!getenv("APP_ENV")) {
-     	    $dotenv = new Dotenv(__DIR__.'/../../');
-     	    $dotenv->load();
-     	}
-     }
+	 /**
+	  * Load Dotenv to grant getenv() access to environment variables in .env file
+	  */
+	 public function loadEnv()
+	 {
+	 	if (!getenv("APP_ENV")) {
+	 		$dotenv = new Dotenv(__DIR__.'/../../');
+	 		$dotenv->load();
+	 	}
+	 }
 
 }

src/Database/DatabaseHandler.php

Indentation +125 added lines, -125 removed lines

@@ -14,89 +14,89 @@ 
 use Laztopaz\potatoORM\EmptyArrayException;
 
 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);
+	}
     
-    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);
-    	return $executeQuery ? : false;
+	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);
+		return $executeQuery ? : false;
     	
 	}
 
-    /**
-     * 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 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);
-    	$boolResponse = $stmt->execute();
-    	return $boolResponse ?  : false;
-    }
+		foreach ($updateParams as $key => $val) {
+			$updateSql .= " WHERE $key = $val";
+		}
+		$stmt = $dbConn->prepare($updateSql);
+		$boolResponse = $stmt->execute();
+		return $boolResponse ?  : false;
+	}
     
   /**
    * This method retrieves record from a table
@@ -108,22 +108,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;
    }
@@ -135,13 +135,13 @@ 
    */
   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;
-      $boolResponse = $dbConn->exec($sql);
-      return $boolResponse ? : false;
+	  $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id;
+	  $boolResponse = $dbConn->exec($sql);
+	  return $boolResponse ? : false;
   }
   
   /**
@@ -152,13 +152,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;
   }
   
   /**
@@ -168,10 +168,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;
   }
   
   /**
@@ -183,21 +183,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");
   }
   
   /**
@@ -207,22 +207,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;
  }
 
 }