github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(database): streamline error handling and improve code clarity in Database class

Browse source 
- Removed unused imports and global variable references to enhance code readability.
- Simplified error handling by refining conditions for empty input arrays.
- Defined variables early in the error logging method to ensure consistent access throughout.
- Improved comments for better understanding of the error handling logic.
This commit is contained in:
Yury Pikhtarev 2025-06-20 14:52:34 +04:00
commit 141d6767d7
No known key found for this signature in database
1 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Database/Database.php
View file

@ -10,16 +10,10 @@
namespace TorrentPier\Database; namespace TorrentPier\Database;
use Nette\Database\Connection; use Nette\Database\Connection;
use Nette\Database\Conventions\DiscoveredConventions;
use Nette\Database\Explorer; use Nette\Database\Explorer;
use Nette\Database\ResultSet; use Nette\Database\ResultSet;
use Nette\Database\Row;
use Nette\Database\Table\Selection;
use Nette\Database\Structure; use Nette\Database\Structure;
use Nette\Database\Conventions\DiscoveredConventions;
use TorrentPier\Database\DebugSelection;
use TorrentPier\Database\DatabaseDebugger;
use TorrentPier\Dev;
use TorrentPier\Legacy\SqlDb;
/** /**
* Modern Database class using Nette Database with backward compatibility * Modern Database class using Nette Database with backward compatibility
@ -64,8 +58,6 @@ class Database
*/ */
private function __construct(array $cfg_values, string $server_name = 'db') private function __construct(array $cfg_values, string $server_name = 'db')
{ {
global $DBS;
$this->cfg = array_combine($this->cfg_keys, $cfg_values); $this->cfg = array_combine($this->cfg_keys, $cfg_values);
$this->db_server = $server_name; $this->db_server = $server_name;
@ -423,8 +415,8 @@ class Database
$dont_escape = $data_already_escaped; $dont_escape = $data_already_escaped;
$check_type = $check_data_type_in_escape; $check_type = $check_data_type_in_escape;
if (empty($input_ary) || !is_array($input_ary)) { if (empty($input_ary)) {
$this->trigger_error(__FUNCTION__ . ' - wrong params: $input_ary'); $this->trigger_error(__FUNCTION__ . ' - wrong params: $input_ary is empty');
} }
if ($query_type == 'INSERT') { if ($query_type == 'INSERT') {
@ -773,6 +765,10 @@ class Database
{ {
$error = $this->sql_error(); $error = $this->sql_error();
// Define these variables early so they're available throughout the method
$is_admin = defined('IS_ADMIN') && IS_ADMIN;
$is_dev_mode = (defined('APP_ENV') && APP_ENV === 'local') || (defined('DBG_USER') && DBG_USER) || function_exists('dev');
// Build a meaningful error message // Build a meaningful error message
if (!empty($error['message'])) { if (!empty($error['message'])) {
$error_msg = "$msg: " . $error['message']; $error_msg = "$msg: " . $error['message'];
@ -784,9 +780,6 @@ class Database
$error_msg = "$msg: Database operation failed"; $error_msg = "$msg: Database operation failed";
// Only add detailed debugging information for administrators or in development mode // Only add detailed debugging information for administrators or in development mode
$is_admin = defined('IS_ADMIN') && IS_ADMIN;
$is_dev_mode = (defined('APP_ENV') && APP_ENV === 'local') || (defined('DBG_USER') && DBG_USER) || function_exists('dev');
if ($is_admin || $is_dev_mode) { if ($is_admin || $is_dev_mode) {
// Gather detailed debugging information - ONLY for admins/developers // Gather detailed debugging information - ONLY for admins/developers
$debug_info = []; $debug_info = [];
@ -853,9 +846,6 @@ class Database
} }
// Add query context for debugging (but only for admins/developers) // Add query context for debugging (but only for admins/developers)
$is_admin = defined('IS_ADMIN') && IS_ADMIN;
$is_dev_mode = (defined('APP_ENV') && APP_ENV === 'local') || (defined('DBG_USER') && DBG_USER) || function_exists('dev');
if ($this->cur_query && ($is_admin || $is_dev_mode)) { if ($this->cur_query && ($is_admin || $is_dev_mode)) {
$error_msg .= "\nQuery: " . $this->cur_query; $error_msg .= "\nQuery: " . $this->cur_query;
} }