Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit e9ffe0ed4525 · 2025-07-29T17:18:13.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4070,9 +4070,6 @@
       <code><![CDATA[$preCount]]></code>
       <code><![CDATA[$total]]></code>
     </UnusedParam>
-    <UnusedProperty>
-      <code><![CDATA[$queryTime]]></code>
-    </UnusedProperty>
   </file>
   <file src="src/Encoding.php">
     <DeprecatedMethod>
diff --git a/resources/js/sql.ts b/resources/js/sql.ts
@@ -660,7 +660,7 @@ AJAX.registerOnload('sql.js', function () {
      */
     $(document).on('makeGrid', '.sqlqueryresults', function () {
         $('.table_results').each(function () {
-            if ($(this).find('td.grid_edit').length > 0) {
+            if (typeof window.makeGrid === 'function') {
                 window.makeGrid(this);
             }
         });
diff --git a/src/Display/Results.php b/src/Display/Results.php
@@ -3008,11 +3008,18 @@ public function getTable(
 
             $sqlQueryMessage = Generator::getMessage($message, $this->sqlQuery, MessageType::Success);
         } elseif (! $this->printView && ! $isLimitedDisplay) {
-            $sqlQueryMessage = Generator::getMessage(
-                __('Your SQL query has been executed successfully.'),
-                $this->sqlQuery,
-                MessageType::Success,
-            );
+            $message = Message::success(__('Your SQL query has been executed successfully.'));
+
+            if ($this->queryTime > 0) {
+                $message->addText('(');
+
+                $messageQueryTime = Message::notice(__('Query took %01.4f seconds.') . ')');
+                $messageQueryTime->addParam($this->queryTime);
+
+                $message->addMessage($messageQueryTime, '');
+            }
+
+            $sqlQueryMessage = Generator::getMessage($message, $this->sqlQuery, MessageType::Success);
         }
 
         // 2.3 Prepare the navigation bars

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ AJAX.registerOnload('sql.js', function () {`
`660`	`660`	`*/`
`661`	`661`	`$(document).on('makeGrid', '.sqlqueryresults', function () {`
`662`	`662`	`$('.table_results').each(function () {`
`663`		`- if ($(this).find('td.grid_edit').length > 0) {`
	`663`	`+ if (typeof window.makeGrid === 'function') {`
`664`	`664`	`window.makeGrid(this);`
`665`	`665`	`}`
`666`	`666`	`});`