Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Backtrace info on queries errors, connect to db only if a query needs to be executed
givanzcb9e3bcaa0bc
diff --git a/system/db/dbdriver.php b/system/db/dbdriver.phpindex 9b6f44d..77cb708 100755--- a/system/db/dbdriver.php+++ b/system/db/dbdriver.php@@ -122,7 +122,7 @@ class DBDriver {foreach ($params as $name => $type) {if (! isset($data[$name])) {if (! $ignoreMissing) {- $errors[] = sprintf('%s missing!', $name);+ $errors[] = sprintf('%s missing!', $name);}continue;@@ -255,6 +255,8 @@ class DBDriver {$query = preg_replace('/LIMIT\s+(\d+|:\w+)\s+OFFSET\s*(\d+|:\w+)\s*;?$/', '', $query);//mysql$query = preg_replace('/LIMIT\s+(\d+|:\w+),\s*(\d+|:\w+)\s*;?$/', '', $query);+ //remove order by+ $query = preg_replace('/ORDER BY\s+([a-z\._\-]+|,|\s+|DESC|ASC)+/', '', $query);$query = preg_replace("/^\s*SELECT .*?\s*FROM\s*$table\s/ms", "SELECT $column FROM $table ", $query);diff --git a/system/db/mysqli.php b/system/db/mysqli.phpindex 664b3c6..070d8b3 100755--- a/system/db/mysqli.php+++ b/system/db/mysqli.php@@ -127,6 +127,10 @@ class Mysqli extends DBDriver {}public function __construct($host = DB_HOST, $dbname = DB_NAME, $user = DB_USER, $pass = DB_PASS, $port = DB_PORT, $prefix = DB_PREFIX) {+ //return $this->connect($host, $dbname, $user, $pass, $port, $prefix);+ }++ public function connect($host = DB_HOST, $dbname = DB_NAME, $user = DB_USER, $pass = DB_PASS, $port = DB_PORT, $prefix = DB_PREFIX) {//mysqli_report(MYSQLI_REPORT_OFF);//connect to databaseif (self :: $link) {@@ -217,11 +221,21 @@ class Mysqli extends DBDriver {}public function query($sql) {+ if (! self :: $link) {+ $this->connect();+ }+if (LOG_SQL_QUERIES) {error_log($sql);}+ try {$result = self :: $link->query($sql);+ } catch (\mysqli_sql_exception $e) {+ $message = $e->getMessage() . "\n" . $sql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);++ throw new \Exception($message, $e->getCode());+ }if ($result) {$this->affected_rows = self :: $link->affected_rows;@@ -232,6 +246,10 @@ class Mysqli extends DBDriver {}public function multi_query($sql) {+ if (! self :: $link) {+ $this->connect();+ }+$result = self :: $link->multi_query($sql);if ($result) {@@ -326,12 +344,16 @@ class Mysqli extends DBDriver {//save orig sql for debugging info$origSql = $sql;+ if (! self :: $link) {+ $this->connect();+ }+list($parameters, $types) = $this->paramsToQmark($sql, $params, $paramTypes);try {$stmt = self::$link->prepare($sql);} catch (\mysqli_sql_exception $e) {- $message = $e->getMessage() . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n - " . $origSql;+ $message = $e->getMessage() . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n - " . $origSql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}@@ -365,7 +387,7 @@ class Mysqli extends DBDriver {error_log($this->debugSql($sql, $params, $paramTypes));}} catch (\mysqli_sql_exception $e) {- $message = $e->getMessage() . "\n" . $origSql . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n" . print_r($parameters, 1) . $types;+ $message = $e->getMessage() . "\n" . $origSql . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n" . print_r($parameters, 1) . $types . "\n" . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}diff --git a/system/db/pgsql.php b/system/db/pgsql.phpindex 45faa6a..f4e7373 100755--- a/system/db/pgsql.php+++ b/system/db/pgsql.php@@ -74,6 +74,10 @@ class Pgsql extends DBDriver {}public function __construct($host = DB_HOST, $dbname = DB_NAME, $user = DB_USER, $pass = DB_PASS, $port = DB_PORT, $prefix = DB_PREFIX) {+ //return $this->connect($host, $dbname, $user, $pass, $port, $prefix);+ }++ public function connect($host = DB_HOST, $dbname = DB_NAME, $user = DB_USER, $pass = DB_PASS, $port = DB_PORT, $prefix = DB_PREFIX) {if (! self :: $link) {//port 5432 for direct pgsql connection 6432 for pgbouncer$port = $port ?: 5432;@@ -198,6 +202,7 @@ class Pgsql extends DBDriver {if (! self :: $link) {return false;}+$result = false;try {@@ -217,8 +222,9 @@ class Pgsql extends DBDriver {if ($this->last_res == false) {$errorMessage = pg_last_error(self :: $link);+ $message = $errorMessage . "\n" . $this->debugSql($origSql, $params) . "\n - " . $origSql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);- throw new \Exception($errorMessage);+ throw new \Exception($message);}if ($result) {@@ -227,7 +233,7 @@ class Pgsql extends DBDriver {return $this->last_res;} catch (\Exception $e) {- $message = $e->getMessage() . "\n$sql\n";+ $message = $e->getMessage() . "\n" . $this->debugSql($origSql, $params) . "\n - " . $origSql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}@@ -307,6 +313,10 @@ class Pgsql extends DBDriver {//save orig sql for debugging info$origSql = $sql;+ if (! self :: $link) {+ $this->connect();+ }+list($parameters, $types) = $this->paramsToQmark($sql, $params, $paramTypes, '$');if (LOG_SQL_QUERIES) {@@ -328,9 +338,9 @@ class Pgsql extends DBDriver {if ($this->last_res == false) {$errorMessage = pg_last_error(self :: $link);//error_log('pgsql error: ' . pg_last_error(self :: $link));- $errorMessage .= $this->debugSql($origSql, $params, $paramTypes);+ $message = $errorMessage . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n - " . $origSql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);- throw new \Exception($errorMessage);+ throw new \Exception($message);}return $this->last_res;diff --git a/system/db/sqlite.php b/system/db/sqlite.phpindex 1f172c9..54ea9e7 100755--- a/system/db/sqlite.php+++ b/system/db/sqlite.php@@ -73,6 +73,10 @@ class Sqlite extends DBDriver {}public function __construct($filename = DB_HOST, $dbname = DB_NAME, $user = DB_USER, $pass = DB_PASS, $port = null, $prefix = DB_PREFIX) {+ //return $this->connect($host, $dbname, $user, $pass, $port, $prefix);+ }++ public function connect($filename = DB_HOST, $dbname = DB_NAME, $user = DB_USER, $pass = DB_PASS, $port = null, $prefix = DB_PREFIX) {if (self :: $link) {return self :: $link;}@@ -190,6 +194,10 @@ class Sqlite extends DBDriver {}public function query($sql) {+ if (! self :: $link) {+ $this->connect();+ }+$result = false;try {@@ -205,10 +213,12 @@ class Sqlite extends DBDriver {$this->num_rows = $result->numColumns() && $result->columnType(0) != SQLITE3_NULL;//$result->finalize();} else {- throw new \Exception($this->error(), $this->errorCode());+ $message = $this->error() . "\n" . $sql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);++ throw new \Exception($message, $this->errorCode());}} catch (\Exception $e) {- $message = $e->getMessage() . "\n$sql\n";+ $message = $e->getMessage() . "\n$sql\n" . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}@@ -239,12 +249,14 @@ class Sqlite extends DBDriver {$this->num_rows = $result->numColumns() && $result->columnType(0) != SQLITE3_NULL;//$result->finalize();} else {- throw new \Exception($this->error(), $this->errorCode());+ $message = $this->error() . "\n" . $sql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);++ throw new \Exception($message, $this->errorCode());}$results[] = $result;} catch (\Exception $e) {- $message = $e->getMessage() . "\n$query\n";+ $message = $e->getMessage() . "\n$sql\n" . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}@@ -254,8 +266,10 @@ class Sqlite extends DBDriver {}public function close() {+ if (self :: $link) {return self :: $link->close();}+ }// Preparepublic function execute($sql, $params = [], $paramTypes = []) {@@ -263,12 +277,16 @@ class Sqlite extends DBDriver {//save orig sql for debugging info$origSql = $sql;+ if (! self :: $link) {+ $this->connect();+ }+list($parameters, $types) = $this->paramsToQmark($sql, $params, $paramTypes);try {$stmt = self::$link->prepare($sql);} catch (\Exception $e) {- $message = $e->getMessage() . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n - " . $origSql;+ $message = $e->getMessage() . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n - " . $origSql . "\n - " . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}@@ -305,7 +323,7 @@ class Sqlite extends DBDriver {error_log($this->debugSql($sql, $params, $paramTypes));}} catch (\Exception $e) {- $message = $e->getMessage() . "\n" . $origSql . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n" . print_r($parameters, 1) . $types;+ $message = $e->getMessage() . "\n" . $origSql . "\n" . $this->debugSql($origSql, $params, $paramTypes) . "\n" . print_r($parameters, 1) . $types . "\n" . print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1), true);throw new \Exception($message, $e->getCode());}