Fix "explain" feature in the debug plugin

joomla · Sep 6, 2020 · 9797ee1 · 9797ee1
1 parent dc8d9de
commit 9797ee1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 16 deletions.
diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js
@@ -217,13 +217,18 @@
                     if (tableExplain) {
                         tableExplain.appendTo(li)
                         for (i in stmt.explain) {
-                            var entry = stmt.explain[i]
-                            tableExplain.append('<tr>'
-                                + '<td>' + entry.id + '</td><td>' + entry.select_type + '</td><td>' + entry.table + '</td>'
-                                + '<td>' + entry.type + '</td><td>' + entry.possible_keys + '</td><td>' + entry.key + '</td>'
-                                + '<td>' + entry.key_len + '</td><td>' + entry.ref + '</td><td>' + entry.rows + '</td>'
-                                + '<td>' + entry.Extra + '</td>'
-                                + '</tr>')
+                            var entry = stmt.explain[i];
+
+                            if (entry.error) {
+                                tableExplain.append('<tr><td colspan="10">' + entry.error + '</td></tr>');
+                            } else {
+                                tableExplain.append('<tr>'
+                                  + '<td>' + entry.id + '</td><td>' + entry.select_type + '</td><td>' + entry.table + '</td>'
+                                  + '<td>' + entry.type + '</td><td>' + entry.possible_keys + '</td><td>' + entry.key + '</td>'
+                                  + '<td>' + entry.key_len + '</td><td>' + entry.ref + '</td><td>' + entry.rows + '</td>'
+                                  + '<td>' + entry.Extra + '</td>'
+                                  + '</tr>');
+                            }
                         }
                     }
 

diff --git a/composer.lock b/composer.lock
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
@@ -508,7 +508,8 @@ public function onAfterDisconnect(ConnectionEvent $event)
 
 		if ($this->params->get('query_explains') && in_array($db->getServerType(), ['mysql', 'postgresql'], true))
 		{
-			$logs = $this->queryMonitor->getLogs();
+			$logs        = $this->queryMonitor->getLogs();
+			$boundParams = $this->queryMonitor->getBoundParams();
 
 			foreach ($logs as $k => $query)
 			{
@@ -524,12 +525,22 @@ public function onAfterDisconnect(ConnectionEvent $event)
 				{
 					try
 					{
-						$db->setQuery('EXPLAIN ' . ($dbVersion56 ? 'EXTENDED ' : '') . $query);
-						$this->explains[$k] = $db->loadAssocList();
+						$queryInstance = $db->getQuery(true);
+						$queryInstance->setQuery('EXPLAIN ' . ($dbVersion56 ? 'EXTENDED ' : '') . $query);
+
+						if ($boundParams[$k])
+						{
+							foreach ($boundParams[$k] as $key => $obj)
+							{
+								$queryInstance->bind($key, $obj->value, $obj->dataType, $obj->length, $obj->driverOptions);
+							}
+						}
+
+						$this->explains[$k] = $db->setQuery($queryInstance)->loadAssocList();
 					}
 					catch (Exception $e)
 					{
-						$this->explains[$k] = [['Error' => $e->getMessage()]];
+						$this->explains[$k] = [['error' => $e->getMessage()]];
 					}
 				}
 			}