| @@ -14,7 +14,6 @@ | ||
| 14 | 14 | use Laztopaz\potatoORM\NoRecordFoundException; | 
| 15 | 15 | use Laztopaz\potatoORM\NoRecordInsertionException; | 
| 16 | 16 | use Laztopaz\potatoORM\NullArgumentPassedToFunction; | 
| 17 | -use Laztopaz\potatoORM\WrongArgumentException; | |
| 18 | 17 | use Laztopaz\potatoORM\NoArgumentPassedToFunctionException; | 
| 19 | 18 | use Laztopaz\potatoORM\EmptyArrayException; | 
| 20 | 19 | |
| @@ -9,7 +9,6 @@ | ||
| 9 | 9 | namespace Laztopaz\potatoORM; | 
| 10 | 10 | |
| 11 | 11 | use PDO; | 
| 12 | -use Laztopaz\potatoORM\DatabaseHelper; | |
| 13 | 12 | use Laztopaz\potatoORM\TableFieldUndefinedException; | 
| 14 | 13 | use Laztopaz\potatoORM\EmptyArrayException; | 
| 15 | 14 | |
| @@ -14,90 +14,90 @@ discard block | ||
| 14 | 14 | use Laztopaz\potatoORM\EmptyArrayException; | 
| 15 | 15 | |
| 16 | 16 |  class DatabaseHandler { | 
| 17 | - private $tableFields; | |
| 18 | - private $dbHelperInstance; | |
| 19 | - private $dbConnection; | |
| 20 | - private $model; | |
| 17 | + private $tableFields; | |
| 18 | + private $dbHelperInstance; | |
| 19 | + private $dbConnection; | |
| 20 | + private $model; | |
| 21 | 21 | |
| 22 | - /** | |
| 23 | - * This is a constructor; a default method that will be called automatically during class instantiation | |
| 24 | - */ | |
| 25 | - public function __construct($modelClassName, $dbConn = Null) | |
| 26 | -     { | |
| 27 | -     	if (is_null($dbConn)) { | |
| 28 | - $this->dbConnection = new DatabaseConnection(); | |
| 29 | -     	} else { | |
| 30 | - $this->dbConnection = $dbConn; | |
| 31 | - } | |
| 32 | - $this->model = $modelClassName; | |
| 33 | - } | |
| 22 | + /** | |
| 23 | + * This is a constructor; a default method that will be called automatically during class instantiation | |
| 24 | + */ | |
| 25 | + public function __construct($modelClassName, $dbConn = Null) | |
| 26 | +	 { | |
| 27 | +	 	if (is_null($dbConn)) { | |
| 28 | + $this->dbConnection = new DatabaseConnection(); | |
| 29 | +	 	} else { | |
| 30 | + $this->dbConnection = $dbConn; | |
| 31 | + } | |
| 32 | + $this->model = $modelClassName; | |
| 33 | + } | |
| 34 | 34 | |
| 35 | - /** | |
| 36 | - * This method create a record and store it in a table row | |
| 37 | - * @params associative array, string tablename | |
| 38 | - * @return boolean true or false | |
| 39 | - */ | |
| 40 | - public function create($associative1DArray, $tableName, $dbConn = Null) | |
| 41 | -    { | |
| 42 | - $tableFields = $this->getColumnNames($this->model, $this->dbConnection); | |
| 35 | + /** | |
| 36 | + * This method create a record and store it in a table row | |
| 37 | + * @params associative array, string tablename | |
| 38 | + * @return boolean true or false | |
| 39 | + */ | |
| 40 | + public function create($associative1DArray, $tableName, $dbConn = Null) | |
| 41 | +	{ | |
| 42 | + $tableFields = $this->getColumnNames($this->model, $this->dbConnection); | |
| 43 | 43 | |
| 44 | - $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields,$associative1DArray); | |
| 45 | -    	if (count($unexpectedFields) > 0) { | |
| 46 | - throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields,"needs to be created as table field"); | |
| 47 | - } | |
| 48 | - unset($tableFields[0]); | |
| 49 | -    	if (is_null($dbConn)) { | |
| 50 | - $dbConn = $this->dbConnection; | |
| 51 | - } | |
| 52 | - $this->insertRecord($dbConn, $tableName, $associative1DArray); | |
| 53 | - } | |
| 44 | + $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($tableFields,$associative1DArray); | |
| 45 | +		if (count($unexpectedFields) > 0) { | |
| 46 | + throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields,"needs to be created as table field"); | |
| 47 | + } | |
| 48 | + unset($tableFields[0]); | |
| 49 | +		if (is_null($dbConn)) { | |
| 50 | + $dbConn = $this->dbConnection; | |
| 51 | + } | |
| 52 | + $this->insertRecord($dbConn, $tableName, $associative1DArray); | |
| 53 | + } | |
| 54 | 54 | |
| 55 | - private function insertRecord($dbConn, $tableName, $associative1DArray) | |
| 56 | -    { | |
| 57 | - $insertQuery = 'INSERT INTO '.$tableName; | |
| 58 | -    	$TableValues = implode(',',array_keys($associative1DArray)); | |
| 59 | -    	foreach ($associative1DArray as $field => $value) { | |
| 60 | - $FormValues[] = "'".trim(addslashes($value))."'"; | |
| 61 | - } | |
| 62 | -    	$splittedTableValues = implode(',', $FormValues); | |
| 63 | -    	$insertQuery.= ' ('.$TableValues.')'; | |
| 64 | -    	$insertQuery.= ' VALUES ('.$splittedTableValues.')'; | |
| 65 | - $executeQuery = $dbConn->exec($insertQuery); | |
| 66 | - return $executeQuery ? : false; | |
| 55 | + private function insertRecord($dbConn, $tableName, $associative1DArray) | |
| 56 | +	{ | |
| 57 | + $insertQuery = 'INSERT INTO '.$tableName; | |
| 58 | +		$TableValues = implode(',',array_keys($associative1DArray)); | |
| 59 | +		foreach ($associative1DArray as $field => $value) { | |
| 60 | + $FormValues[] = "'".trim(addslashes($value))."'"; | |
| 61 | + } | |
| 62 | +		$splittedTableValues = implode(',', $FormValues); | |
| 63 | +		$insertQuery.= ' ('.$TableValues.')'; | |
| 64 | +		$insertQuery.= ' VALUES ('.$splittedTableValues.')'; | |
| 65 | + $executeQuery = $dbConn->exec($insertQuery); | |
| 66 | + return $executeQuery ? : false; | |
| 67 | 67 | |
| 68 | 68 | } | 
| 69 | 69 | |
| 70 | - /** | |
| 71 | - * This method updates any table by supplying 3 parameter | |
| 72 | - * @params: $updateParams, $tableName, $associative1DArray | |
| 73 | - * @return boolean true or false | |
| 74 | - */ | |
| 75 | - public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = Null) | |
| 76 | -    { | |
| 77 | - $sql = ""; | |
| 78 | -    	if (is_null($dbConn)) { | |
| 79 | - $dbConn = $this->dbConnection; | |
| 80 | - } | |
| 81 | - $updateSql = "UPDATE `$tableName` SET "; | |
| 82 | - unset($associative1DArray['id']); | |
| 83 | - $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->getColumnNames($this->model, $this->dbConnection),$associative1DArray); | |
| 70 | + /** | |
| 71 | + * This method updates any table by supplying 3 parameter | |
| 72 | + * @params: $updateParams, $tableName, $associative1DArray | |
| 73 | + * @return boolean true or false | |
| 74 | + */ | |
| 75 | + public function update(array $updateParams, $tableName, $associative1DArray, $dbConn = Null) | |
| 76 | +	{ | |
| 77 | + $sql = ""; | |
| 78 | +		if (is_null($dbConn)) { | |
| 79 | + $dbConn = $this->dbConnection; | |
| 80 | + } | |
| 81 | + $updateSql = "UPDATE `$tableName` SET "; | |
| 82 | + unset($associative1DArray['id']); | |
| 83 | + $unexpectedFields = self::checkIfMagicSetterContainsIsSameAsClassModel($this->getColumnNames($this->model, $this->dbConnection),$associative1DArray); | |
| 84 | 84 | |
| 85 | -    	if (count($unexpectedFields) > 0) { | |
| 86 | - throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields, "needs to be created as table field"); | |
| 87 | - } | |
| 88 | -    	foreach($associative1DArray as $field => $value) { | |
| 89 | - $sql .= "`$field` = '$value'".","; | |
| 90 | - } | |
| 85 | +		if (count($unexpectedFields) > 0) { | |
| 86 | + throw TableFieldUndefinedException::fieldsNotDefinedException($unexpectedFields, "needs to be created as table field"); | |
| 87 | + } | |
| 88 | +		foreach($associative1DArray as $field => $value) { | |
| 89 | + $sql .= "`$field` = '$value'".","; | |
| 90 | + } | |
| 91 | 91 | |
| 92 | - $updateSql .= $this->prepareUpdateQuery($sql); | |
| 92 | + $updateSql .= $this->prepareUpdateQuery($sql); | |
| 93 | 93 | |
| 94 | -    	foreach ($updateParams as $key => $val) { | |
| 95 | - $updateSql .= " WHERE $key = $val"; | |
| 96 | - } | |
| 97 | - $stmt = $dbConn->prepare($updateSql); | |
| 98 | - $boolResponse = $stmt->execute(); | |
| 99 | - return $boolResponse ? : false; | |
| 100 | - } | |
| 94 | +		foreach ($updateParams as $key => $val) { | |
| 95 | + $updateSql .= " WHERE $key = $val"; | |
| 96 | + } | |
| 97 | + $stmt = $dbConn->prepare($updateSql); | |
| 98 | + $boolResponse = $stmt->execute(); | |
| 99 | + return $boolResponse ? : false; | |
| 100 | + } | |
| 101 | 101 | |
| 102 | 102 | /** | 
| 103 | 103 | * This method retrieves record from a table | 
| @@ -109,22 +109,22 @@ discard block | ||
| 109 | 109 | $tableData = []; | 
| 110 | 110 | |
| 111 | 111 |     	if (is_null($dbConn)) { | 
| 112 | - $dbConn = new DatabaseConnection(); | |
| 112 | + $dbConn = new DatabaseConnection(); | |
| 113 | 113 | } | 
| 114 | 114 | $sql = $id ? 'SELECT * FROM '.$tableName.' WHERE id = '.$id : 'SELECT * FROM '.$tableName; | 
| 115 | 115 | |
| 116 | 116 |     	try { | 
| 117 | - $stmt = $dbConn->prepare($sql); | |
| 118 | -   	    $stmt->bindValue(':table', $tableName); | |
| 119 | -   	    $stmt->bindValue(':id', $id); | |
| 120 | - $stmt->execute(); | |
| 117 | + $stmt = $dbConn->prepare($sql); | |
| 118 | +   		$stmt->bindValue(':table', $tableName); | |
| 119 | +   		$stmt->bindValue(':id', $id); | |
| 120 | + $stmt->execute(); | |
| 121 | 121 |     	} catch (PDOException $e) { | 
| 122 | - return $e->getMessage(); | |
| 122 | + return $e->getMessage(); | |
| 123 | 123 | } | 
| 124 | 124 | $results = $stmt->fetchAll(PDO::FETCH_ASSOC); | 
| 125 | 125 | |
| 126 | 126 |     	foreach($results as $result) { | 
| 127 | - array_push($tableData, $result); | |
| 127 | + array_push($tableData, $result); | |
| 128 | 128 | } | 
| 129 | 129 | return $tableData; | 
| 130 | 130 | } | 
| @@ -136,13 +136,13 @@ discard block | ||
| 136 | 136 | */ | 
| 137 | 137 | public static function delete($id, $tableName, $dbConn = Null) | 
| 138 | 138 |    { | 
| 139 | -      if (is_null($dbConn)) { | |
| 140 | - $dbConn = new DatabaseConnection(); | |
| 141 | - } | |
| 139 | +	  if (is_null($dbConn)) { | |
| 140 | + $dbConn = new DatabaseConnection(); | |
| 141 | + } | |
| 142 | 142 | |
| 143 | - $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id; | |
| 144 | - $boolResponse = $dbConn->exec($sql); | |
| 145 | - return $boolResponse ? : false; | |
| 143 | + $sql = 'DELETE FROM '.$tableName.' WHERE id = '.$id; | |
| 144 | + $boolResponse = $dbConn->exec($sql); | |
| 145 | + return $boolResponse ? : false; | |
| 146 | 146 | } | 
| 147 | 147 | |
| 148 | 148 | /** | 
| @@ -153,13 +153,13 @@ discard block | ||
| 153 | 153 | */ | 
| 154 | 154 | public static function checkIfMagicSetterContainsIsSameAsClassModel(array $tableColumn, array $userSetterArray) | 
| 155 | 155 |    { | 
| 156 | - $unexpectedFields = []; | |
| 157 | -      foreach ($userSetterArray as $key => $val) { | |
| 158 | -          if (!in_array($key,$tableColumn)) { | |
| 159 | - $unexpectedFields[] = $key; | |
| 160 | - } | |
| 161 | - } | |
| 162 | - return $unexpectedFields; | |
| 156 | + $unexpectedFields = []; | |
| 157 | +	  foreach ($userSetterArray as $key => $val) { | |
| 158 | +		  if (!in_array($key,$tableColumn)) { | |
| 159 | + $unexpectedFields[] = $key; | |
| 160 | + } | |
| 161 | + } | |
| 162 | + return $unexpectedFields; | |
| 163 | 163 | } | 
| 164 | 164 | |
| 165 | 165 | /** | 
| @@ -169,10 +169,10 @@ discard block | ||
| 169 | 169 | */ | 
| 170 | 170 | public function prepareUpdateQuery($sql) | 
| 171 | 171 |    { | 
| 172 | -      $splittedQuery = explode(",",$sql); | |
| 173 | - array_pop($splittedQuery); | |
| 174 | -      $mergeData = implode(",",$splittedQuery); | |
| 175 | - return $mergeData; | |
| 172 | +	  $splittedQuery = explode(",",$sql); | |
| 173 | + array_pop($splittedQuery); | |
| 174 | +	  $mergeData = implode(",",$splittedQuery); | |
| 175 | + return $mergeData; | |
| 176 | 176 | } | 
| 177 | 177 | |
| 178 | 178 | /** | 
| @@ -184,22 +184,22 @@ discard block | ||
| 184 | 184 | */ | 
| 185 | 185 | public function findAndWhere($params, $tableName, $dbConn) | 
| 186 | 186 |    { | 
| 187 | -      if (is_null($dbConn)) { | |
| 188 | - $dbConn = $this->dbConnection; | |
| 189 | - } | |
| 190 | -      if (is_array($params) && !empty($params)) { | |
| 191 | - $sql = "SELECT * FROM ".$tableName; | |
| 187 | +	  if (is_null($dbConn)) { | |
| 188 | + $dbConn = $this->dbConnection; | |
| 189 | + } | |
| 190 | +	  if (is_array($params) && !empty($params)) { | |
| 191 | + $sql = "SELECT * FROM ".$tableName; | |
| 192 | 192 | |
| 193 | -          foreach ($params as $key => $val) { | |
| 194 | - $sql .= " WHERE `$key` = '$val'"; | |
| 195 | - } | |
| 196 | - $statement = $dbConn->prepare($sql); | |
| 197 | - $statement->execute(); | |
| 198 | - $returnedRowNumbers = $statement->rowCount(); | |
| 193 | +		  foreach ($params as $key => $val) { | |
| 194 | + $sql .= " WHERE `$key` = '$val'"; | |
| 195 | + } | |
| 196 | + $statement = $dbConn->prepare($sql); | |
| 197 | + $statement->execute(); | |
| 198 | + $returnedRowNumbers = $statement->rowCount(); | |
| 199 | 199 | |
| 200 | - return $returnedRowNumbers ? true : false; | |
| 201 | - } | |
| 202 | -      throw EmptyArrayException::checkEmptyArrayException("Array Expected: parameter passed to this function is not an array"); | |
| 200 | + return $returnedRowNumbers ? true : false; | |
| 201 | + } | |
| 202 | +	  throw EmptyArrayException::checkEmptyArrayException("Array Expected: parameter passed to this function is not an array"); | |
| 203 | 203 | } | 
| 204 | 204 | |
| 205 | 205 | /** | 
| @@ -209,22 +209,22 @@ discard block | ||
| 209 | 209 | * @return array | 
| 210 | 210 | */ | 
| 211 | 211 |   public function getColumnNames($table, $dbConn = Null) { | 
| 212 | - $tableFields = []; | |
| 212 | + $tableFields = []; | |
| 213 | 213 | |
| 214 | -     if (is_null($dbConn)) { | |
| 215 | - $dbConn = $this->dbConnection; | |
| 216 | - } | |
| 217 | - $sql = "SHOW COLUMNS FROM ".$table; | |
| 214 | +	 if (is_null($dbConn)) { | |
| 215 | + $dbConn = $this->dbConnection; | |
| 216 | + } | |
| 217 | + $sql = "SHOW COLUMNS FROM ".$table; | |
| 218 | 218 | |
| 219 | - $stmt = $dbConn->prepare($sql); | |
| 220 | -     $stmt->bindValue(':table', $table, PDO::PARAM_STR); | |
| 221 | - $stmt->execute(); | |
| 222 | - $results = $stmt->fetchAll(PDO::FETCH_ASSOC); | |
| 219 | + $stmt = $dbConn->prepare($sql); | |
| 220 | +	 $stmt->bindValue(':table', $table, PDO::PARAM_STR); | |
| 221 | + $stmt->execute(); | |
| 222 | + $results = $stmt->fetchAll(PDO::FETCH_ASSOC); | |
| 223 | 223 | |
| 224 | -     foreach($results as $result) { | |
| 225 | - array_push($tableFields, $result['Field']); | |
| 226 | - } | |
| 227 | - return $tableFields; | |
| 224 | +	 foreach($results as $result) { | |
| 225 | + array_push($tableFields, $result['Field']); | |
| 226 | + } | |
| 227 | + return $tableFields; | |
| 228 | 228 | } | 
| 229 | 229 | |
| 230 | 230 | } | 
| @@ -8,7 +8,6 @@ | ||
| 8 | 8 | |
| 9 | 9 | namespace Laztopaz\potatoORM; | 
| 10 | 10 | |
| 11 | -use PDO; | |
| 12 | 11 | use Laztopaz\potatoORM\TableNotCreatedException; | 
| 13 | 12 | |
| 14 | 13 |  class DatabaseHelper { | 
| @@ -13,25 +13,25 @@ | ||
| 13 | 13 | |
| 14 | 14 |  class DatabaseHelper { | 
| 15 | 15 | |
| 16 | - public $dbConn; | |
| 16 | + public $dbConn; | |
| 17 | 17 | |
| 18 | - /** | |
| 19 | - * This is a constructor; a default method that will be called automatically during class instantiation | |
| 20 | - */ | |
| 21 | - public function __construct($dbConnect) | |
| 22 | -    { | |
| 23 | - $this->dbConn = $dbConnect; | |
| 24 | - } | |
| 18 | + /** | |
| 19 | + * This is a constructor; a default method that will be called automatically during class instantiation | |
| 20 | + */ | |
| 21 | + public function __construct($dbConnect) | |
| 22 | +	{ | |
| 23 | + $this->dbConn = $dbConnect; | |
| 24 | + } | |
| 25 | 25 | |
| 26 | - /** | |
| 27 | - * This method creates a particular table | |
| 28 | - * @param tableName | |
| 29 | - * $return boolean true or false | |
| 30 | - */ | |
| 26 | + /** | |
| 27 | + * This method creates a particular table | |
| 28 | + * @param tableName | |
| 29 | + * $return boolean true or false | |
| 30 | + */ | |
| 31 | 31 | public function createTable($tableName, $conn = NULL) | 
| 32 | 32 |     { | 
| 33 | 33 |     	if (is_null($conn)) { | 
| 34 | - $conn = $this->dbConn; | |
| 34 | + $conn = $this->dbConn; | |
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 |     	$sql = 'CREATE TABLE IF NOT EXISTS '.$tableName.'('; | 
| @@ -12,8 +12,8 @@ | ||
| 12 | 12 | |
| 13 | 13 | class NoRecordDeletionException extends Exception | 
| 14 | 14 |  { | 
| 15 | - public static function checkNoRecordUpdateException($message) | |
| 16 | -    { | |
| 17 | - return new static($message); | |
| 18 | - } | |
| 15 | + public static function checkNoRecordUpdateException($message) | |
| 16 | +	{ | |
| 17 | + return new static($message); | |
| 18 | + } | |
| 19 | 19 | } | 
| @@ -12,9 +12,9 @@ | ||
| 12 | 12 | |
| 13 | 13 |  class EmptyArrayException extends Exception { | 
| 14 | 14 | |
| 15 | - public static function checkEmptyArrayException($message) | |
| 16 | -    { | |
| 17 | - return new static($message); | |
| 18 | - } | |
| 15 | + public static function checkEmptyArrayException($message) | |
| 16 | +	{ | |
| 17 | + return new static($message); | |
| 18 | + } | |
| 19 | 19 | |
| 20 | 20 | } | 
| @@ -12,9 +12,9 @@ | ||
| 12 | 12 | |
| 13 | 13 |  class NoArgumentPassedToFunctionException extends Exception { | 
| 14 | 14 | |
| 15 | - public static function checkNoArgumentPassedToFunction($message) | |
| 16 | -    { | |
| 17 | - return new static($message); | |
| 18 | - } | |
| 15 | + public static function checkNoArgumentPassedToFunction($message) | |
| 16 | +	{ | |
| 17 | + return new static($message); | |
| 18 | + } | |
| 19 | 19 | |
| 20 | 20 | } | 
| @@ -12,8 +12,8 @@ | ||
| 12 | 12 | |
| 13 | 13 |  class NoRecordInsertionException extends Exception { | 
| 14 | 14 | |
| 15 | - public static function checkNoRecordAddedException($mesaage) | |
| 16 | -    { | |
| 17 | - return new static($mesaage); | |
| 18 | - } | |
| 15 | + public static function checkNoRecordAddedException($mesaage) | |
| 16 | +	{ | |
| 17 | + return new static($mesaage); | |
| 18 | + } | |
| 19 | 19 | } | 
| @@ -12,9 +12,9 @@ | ||
| 12 | 12 | |
| 13 | 13 |  class NoRecordUpdateException extends  Exception { | 
| 14 | 14 | |
| 15 | - public static function checkNoRecordUpdateException($message) | |
| 16 | -    { | |
| 17 | - return new static($message); | |
| 18 | - } | |
| 15 | + public static function checkNoRecordUpdateException($message) | |
| 16 | +	{ | |
| 17 | + return new static($message); | |
| 18 | + } | |
| 19 | 19 | |
| 20 | 20 | } | 
| @@ -12,9 +12,9 @@ | ||
| 12 | 12 | |
| 13 | 13 |  class NullArgumentPassedToFunction extends Exception { | 
| 14 | 14 | |
| 15 | - public static function ckeckNullArgumentPassedToFunction($message) | |
| 16 | -    { | |
| 17 | - return new static ($message); | |
| 18 | - } | |
| 15 | + public static function ckeckNullArgumentPassedToFunction($message) | |
| 16 | +	{ | |
| 17 | + return new static ($message); | |
| 18 | + } | |
| 19 | 19 | |
| 20 | 20 | } |