Skip to content

Commit a4173dc

Browse files
muhammetsafakmuhammetsafak
authored
Merge pull request #12 from InitPHP/main-dev
Main dev
2 parents aaca370 + 8c7e9da commit a4173dc

21 files changed

+58
-24
lines changed

‎src/Database.php‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

@@ -59,6 +59,8 @@ class Database extends QueryBuilder
5959
'deletable' => true,
6060
'updatable' => true,
6161
'return' => null,
62+
'debug' => false,
63+
'log' => null,
6264
];
6365

6466
private Result $_last;
@@ -354,9 +356,13 @@ final public function query(string $sqlQuery, array $parameters = []): Result
354356
}
355357
} catch (\Exception $e) {
356358
$message = $e->getMessage();
357-
if(($this->_credentials['debug'] ?? false) === TRUE){
358-
$message .= ' SQL : '
359-
. (empty($parameters) ? $sqlQuery : \strtr($sqlQuery, $parameters));
359+
$sqlMessage = 'SQL : '
360+
. (empty($parameters) ? $sqlQuery : strtr($sqlQuery, $parameters));
361+
if(!empty($this->_credentials['log'])){
362+
$this->_logCreate($message . ' ' . $sqlMessage);
363+
}
364+
if($this->_credentials['debug'] === TRUE){
365+
$message .= $message . ' ' . $sqlMessage;
360366
}
361367
throw new SQLQueryExecuteException($e->getMessage(), (int)$e->getCode());
362368
}
@@ -801,6 +807,34 @@ public function _deleteQuery(): string
801807
. $this->_limitQuery();
802808
}
803809

810+
protected function _logCreate(string $message): void
811+
{
812+
if(empty($this->_credentials['log'])){
813+
return;
814+
}
815+
if(\is_callable($this->_credentials['log'])){
816+
\call_user_func_array($this->_credentials['log'], [$message]);
817+
return;
818+
}
819+
if(\is_string($this->_credentials['log'])){
820+
$path = \strtr($this->_credentials['log'], [
821+
'{timestamp}' => \time(),
822+
'{date}' => \date("Y-m-d"),
823+
'{year}' => \date("Y"),
824+
'{month}' => \date("m"),
825+
'{day}' => \date("d"),
826+
'{hour}' => \date("H"),
827+
'{minute}' => \date("i"),
828+
'{second}' => \date("s"),
829+
]);
830+
@\file_put_contents($path, $message, \FILE_APPEND);
831+
return;
832+
}
833+
if(\is_object($this->_credentials['log']) && \method_exists($this->_credentials['log'], 'critical')){
834+
$this->_credentials['log']->critical($message);
835+
}
836+
}
837+
804838
private function _whereQuery(): string
805839
{
806840
$isAndEmpty = empty($this->_STRUCTURE['where']['AND']);

‎src/Entity.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/ConnectionException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/DeletableException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/ModelCallbacksException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/ModelException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/ModelRelationsException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/ReadableException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/SQLQueryExecuteException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

‎src/Exceptions/UpdatableException.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @author Muhammet ŞAFAK <[email protected]>
88
* @copyright Copyright © 2022 Muhammet ŞAFAK
99
* @license ./LICENSE MIT
10-
* @version 2.0
10+
* @version 2.0.5
1111
* @link https://www.muhammetsafak.com.tr
1212
*/
1313

0 commit comments

Comments
 (0)