'
+ . '⚠️ Legacy Query Warning: '
+ . $totalLegacyQueries . ' quer' . ($totalLegacyQueries > 1 ? 'ies' : 'y') . ' with duplicate columns detected and automatically fixed. '
+ . 'These queries should be updated to explicitly select columns. '
+ . 'Check the legacy_queries.log file for details.'
+ . '
';
+ }
// Get debug information from new database system
- $server_names = \TorrentPier\Database\DatabaseFactory::getServerNames();
foreach ($server_names as $srv_name) {
try {
$db_obj = \TorrentPier\Database\DatabaseFactory::getInstance($srv_name);
@@ -262,7 +285,14 @@ class Dev
$info_plain = !empty($dbg['info_plain']) ? $dbg['info_plain'] . ' [' . $dbg['src'] . ']' : $dbg['src'];
$info = !empty($dbg['info']) ? $dbg['info'] . ' [' . $dbg['src'] . ']' : $dbg['src'];
- $log .= ''
+ // Check if this is a legacy query that needed compatibility fix
+ $isLegacyQuery = !empty($dbg['is_legacy_query']);
+ $rowClass = $isLegacyQuery ? 'sqlLogRow sqlLegacyRow' : 'sqlLogRow';
+ $rowStyle = $isLegacyQuery ? ' style="background-color: #ffe6e6; border-left: 4px solid #dc3545; color: #721c24;"' : '';
+ $legacyWarning = $isLegacyQuery ? '
[LEGACY]' : '';
+
+ $log .= '
'
+ . $legacyWarning
. '' . $time . ' '
. '' . $perc . ' '
. '' . $sql . ''
diff --git a/src/Whoops/DatabaseErrorHandler.php b/src/Whoops/DatabaseErrorHandler.php
new file mode 100644
index 000000000..8b0aa8392
--- /dev/null
+++ b/src/Whoops/DatabaseErrorHandler.php
@@ -0,0 +1,353 @@
+addToOutput) {
+ return Handler::DONE;
+ }
+
+ $inspector = $this->getInspector();
+ $exception = $inspector->getException();
+
+ // Add database information to the exception frames
+ $this->addDatabaseContextToFrames($inspector);
+
+ // Add global database state information
+ $this->addGlobalDatabaseInfo($exception);
+
+ return Handler::DONE;
+ }
+
+ /**
+ * Set whether to add database info to output
+ */
+ public function setAddToOutput(bool $add): self
+ {
+ $this->addToOutput = $add;
+ return $this;
+ }
+
+ /**
+ * Set whether to include query history
+ */
+ public function setIncludeQueryHistory(bool $include): self
+ {
+ $this->includeQueryHistory = $include;
+ return $this;
+ }
+
+ /**
+ * Set maximum number of queries to show in history
+ */
+ public function setMaxQueryHistory(int $max): self
+ {
+ $this->maxQueryHistory = max(1, $max);
+ return $this;
+ }
+
+ /**
+ * Add database context information to exception frames
+ */
+ private function addDatabaseContextToFrames($inspector): void
+ {
+ $frames = $inspector->getFrames();
+
+ foreach ($frames as $frame) {
+ $frameData = [];
+
+ // Check if this frame involves database operations
+ $fileName = $frame->getFile();
+ $className = $frame->getClass();
+ $functionName = $frame->getFunction();
+
+ // Detect database-related frames
+ $isDatabaseFrame = $this->isDatabaseRelatedFrame($fileName, $className, $functionName);
+
+ if ($isDatabaseFrame) {
+ $frameData['database_context'] = $this->getCurrentDatabaseContext();
+
+ // Add frame-specific database info
+ $frame->addComment('Database Context', 'This frame involves database operations');
+
+ foreach ($frameData['database_context'] as $key => $value) {
+ if (is_string($value) || is_numeric($value)) {
+ $frame->addComment("DB: $key", $value);
+ } elseif (is_array($value) && !empty($value)) {
+ $frame->addComment("DB: $key", json_encode($value, JSON_PRETTY_PRINT));
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Add global database information to the exception
+ */
+ private function addGlobalDatabaseInfo($exception): void
+ {
+ try {
+ $databaseInfo = $this->collectDatabaseInformation();
+
+ // Use reflection to add custom data to the exception
+ // This will appear in the Whoops error page
+ if (method_exists($exception, 'setAdditionalInfo')) {
+ $exception->setAdditionalInfo('Database Information', $databaseInfo);
+ } else {
+ // Fallback: store in a property that Whoops can access
+ if (!isset($exception->databaseInfo)) {
+ $exception->databaseInfo = $databaseInfo;
+ }
+ }
+ } catch (\Exception $e) {
+ // Don't let database info collection break error handling
+ if (method_exists($exception, 'setAdditionalInfo')) {
+ $exception->setAdditionalInfo('Database Info Error', $e->getMessage());
+ }
+ }
+ }
+
+ /**
+ * Check if a frame is related to database operations
+ */
+ private function isDatabaseRelatedFrame(?string $fileName, ?string $className, ?string $functionName): bool
+ {
+ if (!$fileName) {
+ return false;
+ }
+
+ // Check file paths
+ $databaseFiles = [
+ '/Database/',
+ '/database/',
+ 'Database.php',
+ 'DatabaseDebugger.php',
+ 'DebugSelection.php',
+ ];
+
+ foreach ($databaseFiles as $dbFile) {
+ if (str_contains($fileName, $dbFile)) {
+ return true;
+ }
+ }
+
+ // Check class names
+ $databaseClasses = [
+ 'Database',
+ 'DatabaseDebugger',
+ 'DebugSelection',
+ 'DB',
+ 'Nette\Database',
+ ];
+
+ if ($className) {
+ foreach ($databaseClasses as $dbClass) {
+ if (str_contains($className, $dbClass)) {
+ return true;
+ }
+ }
+ }
+
+ // Check function names
+ $databaseFunctions = [
+ 'sql_query',
+ 'fetch_row',
+ 'fetch_rowset',
+ 'sql_fetchrow',
+ 'query',
+ 'execute',
+ ];
+
+ if ($functionName) {
+ foreach ($databaseFunctions as $dbFunc) {
+ if (str_contains($functionName, $dbFunc)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Get current database context
+ */
+ private function getCurrentDatabaseContext(): array
+ {
+ $context = [];
+
+ try {
+ // Get main database instance
+ if (function_exists('DB')) {
+ $db = DB();
+
+ $context['current_query'] = $db->cur_query ?? 'None';
+ $context['database_server'] = $db->db_server ?? 'Unknown';
+ $context['selected_database'] = $db->selected_db ?? 'Unknown';
+
+ // Connection status
+ $context['connection_status'] = $db->connection ? 'Active' : 'No connection';
+
+ // Query stats
+ $context['total_queries'] = $db->num_queries ?? 0;
+ $context['total_time'] = isset($db->sql_timetotal) ? sprintf('%.3f sec', $db->sql_timetotal) : 'Unknown';
+
+ // Recent error information
+ $sqlError = $db->sql_error();
+ if (!empty($sqlError['message'])) {
+ $context['last_error'] = $sqlError;
+ }
+ }
+ } catch (\Exception $e) {
+ $context['error'] = 'Could not retrieve database context: ' . $e->getMessage();
+ }
+
+ return $context;
+ }
+
+ /**
+ * Collect comprehensive database information
+ */
+ private function collectDatabaseInformation(): array
+ {
+ $info = [
+ 'timestamp' => date('Y-m-d H:i:s'),
+ 'request_uri' => $_SERVER['REQUEST_URI'] ?? 'CLI',
+ 'user_ip' => $_SERVER['REMOTE_ADDR'] ?? 'Unknown',
+ ];
+
+ try {
+ // Get information from all database servers
+ if (class_exists('\TorrentPier\Database\DatabaseFactory')) {
+ $serverNames = \TorrentPier\Database\DatabaseFactory::getServerNames();
+
+ foreach ($serverNames as $serverName) {
+ try {
+ $db = \TorrentPier\Database\DatabaseFactory::getInstance($serverName);
+
+ $serverInfo = [
+ 'server_name' => $serverName,
+ 'engine' => $db->engine ?? 'Unknown',
+ 'host' => $db->db_server ?? 'Unknown',
+ 'database' => $db->selected_db ?? 'Unknown',
+ 'connection_status' => $db->connection ? 'Connected' : 'Disconnected',
+ 'total_queries' => $db->num_queries ?? 0,
+ 'total_time' => isset($db->sql_timetotal) ? sprintf('%.3f sec', $db->sql_timetotal) : 'Unknown',
+ ];
+
+ // Current query
+ if (!empty($db->cur_query)) {
+ $serverInfo['current_query'] = $this->formatQueryForDisplay($db->cur_query);
+ }
+
+ // Last error
+ $sqlError = $db->sql_error();
+ if (!empty($sqlError['message'])) {
+ $serverInfo['last_error'] = $sqlError;
+ }
+
+ // Recent query history (if available and enabled)
+ if ($this->includeQueryHistory && !empty($db->dbg)) {
+ $recentQueries = array_slice($db->dbg, -$this->maxQueryHistory);
+ $serverInfo['recent_queries'] = [];
+
+ foreach ($recentQueries as $query) {
+ $serverInfo['recent_queries'][] = [
+ 'sql' => $this->formatQueryForDisplay($query['sql'] ?? 'Unknown'),
+ 'time' => isset($query['time']) ? sprintf('%.3f sec', $query['time']) : 'Unknown',
+ 'source' => $query['src'] ?? 'Unknown',
+ ];
+ }
+ }
+
+ $info['databases'][$serverName] = $serverInfo;
+
+ } catch (\Exception $e) {
+ $info['databases'][$serverName] = [
+ 'error' => 'Could not retrieve info: ' . $e->getMessage()
+ ];
+ }
+ }
+ }
+
+ // Legacy single database support
+ if (function_exists('DB') && empty($info['databases'])) {
+ $db = DB();
+
+ $info['legacy_database'] = [
+ 'engine' => $db->engine ?? 'Unknown',
+ 'host' => $db->db_server ?? 'Unknown',
+ 'database' => $db->selected_db ?? 'Unknown',
+ 'connection_status' => $db->connection ? 'Connected' : 'Disconnected',
+ 'total_queries' => $db->num_queries ?? 0,
+ 'total_time' => isset($db->sql_timetotal) ? sprintf('%.3f sec', $db->sql_timetotal) : 'Unknown',
+ ];
+
+ if (!empty($db->cur_query)) {
+ $info['legacy_database']['current_query'] = $this->formatQueryForDisplay($db->cur_query);
+ }
+
+ $sqlError = $db->sql_error();
+ if (!empty($sqlError['message'])) {
+ $info['legacy_database']['last_error'] = $sqlError;
+ }
+ }
+
+ } catch (\Exception $e) {
+ $info['collection_error'] = $e->getMessage();
+ }
+
+ return $info;
+ }
+
+ /**
+ * Format SQL query for readable display
+ */
+ private function formatQueryForDisplay(string $query, int $maxLength = 500): string
+ {
+ // Remove comments at the start (debug info)
+ $query = preg_replace('#^/\*.*?\*/#', '', $query);
+ $query = trim($query);
+
+ // Truncate if too long
+ if (strlen($query) > $maxLength) {
+ $query = substr($query, 0, $maxLength) . '... [truncated]';
+ }
+
+ return $query;
+ }
+
+ /**
+ * Get priority - run after the main PrettyPageHandler
+ */
+ public function contentType(): ?string
+ {
+ return 'text/html';
+ }
+}
diff --git a/src/Whoops/EnhancedPrettyPageHandler.php b/src/Whoops/EnhancedPrettyPageHandler.php
new file mode 100644
index 000000000..818b86559
--- /dev/null
+++ b/src/Whoops/EnhancedPrettyPageHandler.php
@@ -0,0 +1,269 @@
+connection ? 'Connected' : 'Disconnected';
+ $info['Database Server'] = $db->db_server ?? 'Unknown';
+ $info['Selected Database'] = $db->selected_db ?? 'Unknown';
+ $info['Database Engine'] = $db->engine ?? 'Unknown';
+ $info['Total Queries'] = $db->num_queries ?? 0;
+
+ if (isset($db->sql_timetotal)) {
+ $info['Total Query Time'] = sprintf('%.3f seconds', $db->sql_timetotal);
+ }
+
+ // Current/Last executed query
+ if (!empty($db->cur_query)) {
+ $info['Current Query'] = $this->formatSqlQuery($db->cur_query);
+ }
+
+ // Database error information
+ $sqlError = $db->sql_error();
+ if (!empty($sqlError['message'])) {
+ $info['Last Database Error'] = [
+ 'Code' => $sqlError['code'] ?? 'Unknown',
+ 'Message' => $sqlError['message'],
+ ];
+ }
+
+ // Connection details if available
+ if ($db->connection) {
+ try {
+ $pdo = $db->connection->getPdo();
+ if ($pdo) {
+ $info['PDO Driver'] = $pdo->getAttribute(\PDO::ATTR_DRIVER_NAME) ?? 'Unknown';
+ $info['Server Version'] = $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION) ?? 'Unknown';
+
+ // Current PDO error state
+ $errorCode = $pdo->errorCode();
+ if ($errorCode && $errorCode !== '00000') {
+ $errorInfo = $pdo->errorInfo();
+ $info['PDO Error State'] = [
+ 'Code' => $errorCode,
+ 'Info' => $errorInfo[2] ?? 'Unknown'
+ ];
+ }
+ }
+ } catch (\Exception $e) {
+ $info['PDO Error'] = $e->getMessage();
+ }
+ }
+ }
+
+ // Get information from all database servers (new system)
+ if (class_exists('\TorrentPier\Database\DatabaseFactory')) {
+ try {
+ $serverNames = \TorrentPier\Database\DatabaseFactory::getServerNames();
+
+ if (count($serverNames) > 1) {
+ foreach ($serverNames as $serverName) {
+ try {
+ $db = \TorrentPier\Database\DatabaseFactory::getInstance($serverName);
+ $info["Server: $serverName"] = [
+ 'Host' => $db->db_server ?? 'Unknown',
+ 'Database' => $db->selected_db ?? 'Unknown',
+ 'Queries' => $db->num_queries ?? 0,
+ 'Connected' => $db->connection ? 'Yes' : 'No',
+ ];
+ } catch (\Exception $e) {
+ $info["Server: $serverName"] = ['Error' => $e->getMessage()];
+ }
+ }
+ }
+ } catch (\Exception $e) {
+ $info['Multi-Server Error'] = $e->getMessage();
+ }
+ }
+
+ } catch (\Exception $e) {
+ $info['Collection Error'] = $e->getMessage();
+ }
+
+ return $info;
+ }
+
+ /**
+ * Get recent SQL queries from debug log
+ */
+ private function getRecentSqlQueries(): array
+ {
+ $queries = [];
+
+ try {
+ if (function_exists('DB')) {
+ $db = DB();
+
+ // Check if debug information is available
+ if (!empty($db->dbg) && is_array($db->dbg)) {
+ // Get last 5 queries
+ $recentQueries = array_slice($db->dbg, -5);
+
+ foreach ($recentQueries as $index => $queryInfo) {
+ $queryNum = $index + 1;
+ $queries["Query #$queryNum"] = [
+ 'SQL' => $this->formatSqlQuery($queryInfo['sql'] ?? 'Unknown'),
+ 'Time' => isset($queryInfo['time']) ? sprintf('%.3f sec', $queryInfo['time']) : 'Unknown',
+ 'Source' => $queryInfo['src'] ?? 'Unknown',
+ 'Info' => $queryInfo['info'] ?? '',
+ ];
+
+ // Add memory info if available
+ if (isset($queryInfo['mem_before'], $queryInfo['mem_after'])) {
+ $memUsed = $queryInfo['mem_after'] - $queryInfo['mem_before'];
+ $queries["Query #$queryNum"]['Memory'] = sprintf('%+d bytes', $memUsed);
+ }
+ }
+ }
+
+ if (empty($queries)) {
+ $queries['Info'] = 'No query debug information available. Enable debug mode to see recent queries.';
+ }
+ }
+ } catch (\Exception $e) {
+ $queries['Error'] = $e->getMessage();
+ }
+
+ return $queries;
+ }
+
+ /**
+ * Get TorrentPier environment information
+ */
+ private function getTorrentPierEnvironment(): array
+ {
+ $env = [];
+
+ try {
+ // Basic environment
+ $env['Application Environment'] = defined('APP_ENV') ? APP_ENV : 'Unknown';
+ $env['Debug Mode'] = defined('DBG_USER') && DBG_USER ? 'Enabled' : 'Disabled';
+ $env['SQL Debug'] = defined('SQL_DEBUG') && SQL_DEBUG ? 'Enabled' : 'Disabled';
+
+ // Configuration status
+ if (function_exists('config')) {
+ $config = config();
+ $env['Config Loaded'] = 'Yes';
+ $env['TorrentPier Version'] = $config->get('tp_version', 'Unknown');
+ $env['Board Title'] = $config->get('sitename', 'Unknown');
+ } else {
+ $env['Config Loaded'] = 'No';
+ }
+
+ // Cache system
+ if (function_exists('CACHE')) {
+ $env['Cache System'] = 'Available';
+ }
+
+ // Language system
+ if (function_exists('lang')) {
+ $env['Language System'] = 'Available';
+ if (isset(lang()->getCurrentLanguage)) {
+ $env['Current Language'] = lang()->getCurrentLanguage;
+ }
+ }
+
+ // Memory and timing
+ if (defined('TIMESTART')) {
+ $env['Execution Time'] = sprintf('%.3f sec', microtime(true) - TIMESTART);
+ }
+
+ if (function_exists('sys')) {
+ // Use plain text formatting for memory values (no HTML entities)
+ $env['Peak Memory'] = str_replace(' ', ' ', humn_size(sys('mem_peak')));
+ $env['Current Memory'] = str_replace(' ', ' ', humn_size(sys('mem')));
+ }
+
+ // Request information
+ $env['Request Method'] = $_SERVER['REQUEST_METHOD'] ?? 'Unknown';
+ $env['Request URI'] = $_SERVER['REQUEST_URI'] ?? 'CLI';
+ $env['User Agent'] = $_SERVER['HTTP_USER_AGENT'] ?? 'Unknown';
+ $env['Remote IP'] = $_SERVER['REMOTE_ADDR'] ?? 'Unknown';
+
+ } catch (\Exception $e) {
+ $env['Error'] = $e->getMessage();
+ }
+
+ return $env;
+ }
+
+ /**
+ * Format SQL query for display
+ */
+ private function formatSqlQuery(string $query): string
+ {
+ // Remove debug comments
+ $query = preg_replace('#^/\*.*?\*/#', '', $query);
+ $query = trim($query);
+
+ // Truncate very long queries but keep them readable
+ if (strlen($query) > 1000) {
+ return substr($query, 0, 1000) . "\n... [Query truncated - " . (strlen($query) - 1000) . " more characters]";
+ }
+
+ return $query;
+ }
+
+ /**
+ * Override parent method to add database info and custom styling
+ */
+ public function handle()
+ {
+ // Add TorrentPier-specific database information dynamically
+ try {
+ $this->addDataTable('Database Information', $this->getDatabaseInformation());
+ } catch (\Exception $e) {
+ $this->addDataTable('Database Information', ['Error' => $e->getMessage()]);
+ }
+
+ try {
+ $this->addDataTable('Recent SQL Queries', $this->getRecentSqlQueries());
+ } catch (\Exception $e) {
+ $this->addDataTable('Recent SQL Queries', ['Error' => $e->getMessage()]);
+ }
+
+ try {
+ $this->addDataTable('TorrentPier Environment', $this->getTorrentPierEnvironment());
+ } catch (\Exception $e) {
+ $this->addDataTable('TorrentPier Environment', ['Error' => $e->getMessage()]);
+ }
+
+ return parent::handle();
+ }
+}
diff --git a/src/Whoops/README.md b/src/Whoops/README.md
new file mode 100644
index 000000000..90f96f8df
--- /dev/null
+++ b/src/Whoops/README.md
@@ -0,0 +1,131 @@
+# TorrentPier Whoops Enhanced Error Reporting
+
+This directory contains enhanced Whoops error handlers specifically designed for TorrentPier to provide better debugging information when database errors occur.
+
+## Features
+
+### Enhanced Database Error Reporting
+
+The enhanced Whoops handlers provide comprehensive database information when errors occur:
+
+1. **Current SQL Query** - Shows the exact query that caused the error
+2. **Recent Query History** - Displays the last 5 SQL queries executed
+3. **Database Connection Status** - Connection state, server info, database name
+4. **Error Context** - PDO error codes, exception details, source location
+5. **TorrentPier Environment** - Debug mode status, system information
+
+### Components
+
+#### EnhancedPrettyPageHandler
+
+Extends Whoops' default `PrettyPageHandler` to include:
+- **Database Information** table with connection details and current query
+- **Recent SQL Queries** table showing query history with timing
+- **TorrentPier Environment** table with system status
+
+#### DatabaseErrorHandler
+
+Specialized handler that:
+- Adds database context to exception stack frames
+- Identifies database-related code in the call stack
+- Collects comprehensive database state information
+- Formats SQL queries for readable display
+
+## Usage
+
+The enhanced handlers are automatically activated when `DBG_USER` is enabled in TorrentPier configuration.
+
+### Automatic Integration
+
+```php
+// In src/Dev.php - automatically configured
+$prettyPageHandler = new \TorrentPier\Whoops\EnhancedPrettyPageHandler();
+```
+
+### Database Error Logging
+
+Database errors are now automatically logged even when they occur in Nette Database layer:
+
+```php
+// Enhanced error handling in Database.php
+try {
+ $row = $result->fetch();
+} catch (\Exception $e) {
+ // Log the error including the query that caused it
+ $this->debugger->log_error($e);
+ throw $e; // Re-throw for Whoops display
+}
+```
+
+## Error Information Displayed
+
+When a database error occurs, Whoops will now show:
+
+### Database Information
+- Connection Status: Connected/Disconnected
+- Database Server: Host and port information
+- Selected Database: Current database name
+- Database Engine: MySQL/PostgreSQL/etc.
+- Total Queries: Number of queries executed
+- Total Query Time: Cumulative execution time
+- Current Query: The SQL that caused the error
+- Last Database Error: Error code and message
+- PDO Driver: Database driver information
+- Server Version: Database server version
+
+### Recent SQL Queries
+- **Query #1-5**: Last 5 queries executed
+ - SQL: Formatted query text
+ - Time: Execution time in seconds
+ - Source: File and line where query originated
+ - Info: Additional query information
+ - Memory: Memory usage if available
+
+### TorrentPier Environment
+- Application Environment: local/production/etc.
+- Debug Mode: Enabled/Disabled
+- SQL Debug: Enabled/Disabled
+- TorrentPier Version: Current version
+- Config Loaded: Configuration status
+- Cache System: Availability status
+- Language System: Status and encoding
+- Template System: Twig-based availability
+- Execution Time: Request processing time
+- Peak Memory: Maximum memory used
+- Current Memory: Current memory usage
+- Request Method: GET/POST/etc.
+- Request URI: Current page
+- User Agent: Browser information
+- Remote IP: Client IP address
+
+## Configuration
+
+The enhanced handlers respect TorrentPier's debug configuration:
+
+- `DBG_USER`: Must be enabled to show enhanced error pages
+- `SQL_DEBUG`: Enables SQL query logging and timing
+- `APP_ENV`: Determines environment-specific features
+
+## Logging
+
+Database errors are now logged in multiple locations:
+
+1. **PHP Error Log**: Basic error message
+2. **TorrentPier bb_log**: Detailed error with context (`database_errors.log`)
+3. **Whoops Log**: Complete error details (`php_whoops.log`)
+
+## Security
+
+The enhanced handlers maintain security by:
+- Only showing detailed information when `DBG_USER` is enabled
+- Using Whoops' blacklist for sensitive data
+- Logging detailed information to files (not user-accessible)
+- Providing generic error messages to non-debug users
+
+## Backward Compatibility
+
+All enhancements are:
+- **100% backward compatible** with existing TorrentPier code
+- **Non-breaking** - existing error handling continues to work
+- **Optional** - only activated in debug mode
+- **Safe** - no security implications for production use
\ No newline at end of file