Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 1280adb2c8c3 · 2025-01-13T16:17:52.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -152,6 +152,14 @@ phpMyAdmin - ChangeLog
 - issue #19321 Suppress deprecation message of E_STRICT constant
 - issue        Fix PHP 8.4 `str_getcsv` `$escape` parameter deprecation
 - issue #19426 Fix PHP warnings when the column is a `COMPRESSED BLOB`
+- issue        Allow opening server breadcrumb links in new tab with Ctrl/Meta key
+- issue #19500 Use `KILL` instead of `CALL mysql.rds_kill` for non super users
+- issue        Fix "copy to clipboard" was adding a blank row for each repeating header row
+- issue        Fix TCPDF translations
+- issue        Remove underline for links on Bootstrap theme
+- issue        Fix sql editor height on multi-table query
+- issue #18852 Fix notification color scheme on the Bootstrap dark theme
+- issue #14542 Show the query even if no results are found in the Table search
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss
@@ -763,10 +763,10 @@ select.invalid_value,
   background-image: url("../img/ajax_clock_small.gif");
   background-repeat: no-repeat;
   background-position: 2%;
-  border: 1px solid #e2b709;
-  background-color: #ffe57e;
+  border: 1px solid var(--bs-warning-border-subtle);
+  background-color: var(--bs-warning-bg-subtle);
+  color: var(--bs-warning-text-emphasis);
   border-radius: 5px;
-  box-shadow: 0 5px 90px #888;
 }
 
 #loading_parent {
diff --git a/public/themes/bootstrap/scss/_variables.scss b/public/themes/bootstrap/scss/_variables.scss
@@ -2,6 +2,11 @@
 
 $navigation-width: 240px !default;
 
+// Links
+
+$link-decoration: none;
+$link-hover-decoration: underline;
+
 // Breadcrumbs
 
 $breadcrumb-navbar-padding-y: 0.5rem !default;
diff --git a/resources/js/src/database/multi_table_query.ts b/resources/js/src/database/multi_table_query.ts
@@ -42,7 +42,7 @@ AJAX.registerTeardown('database/multi_table_query.js', function () {
 AJAX.registerOnload('database/multi_table_query.js', function () {
     var editor = getSqlEditor($('#MultiSqlquery'), {}, 'vertical');
     $('.CodeMirror-line').css('text-align', 'left');
-    editor.setSize(-1, 50);
+    editor.setSize(-1, -1);
 
     var columnCount = 3;
     addNewColumnCallbacks();
diff --git a/resources/js/src/modules/functions.ts b/resources/js/src/modules/functions.ts
@@ -3362,11 +3362,18 @@ export function floatingMenuBar () {
 
 /**
  * Scrolls the page to the top if clicking the server-breadcrumb bar
+ * If the user holds the Ctrl (or Meta on macOS) key, it prevents the scroll
+ * so they can open the link in a new tab.
+ *
  * @return {function}
  */
 export function breadcrumbScrollToTop () {
     return function () {
         $(document).on('click', '#server-breadcrumb, #goto_pagetop', function (event) {
+            if (event.ctrlKey || event.metaKey) {
+                return;
+            }
+
             event.preventDefault();
             $('html, body').animate({ scrollTop: 0 }, 'fast');
         });
diff --git a/resources/js/src/sql.ts b/resources/js/src/sql.ts
@@ -624,6 +624,10 @@ AJAX.registerOnload('sql.js', function () {
 
         textArea.value += '\n';
         $('.table_results tbody tr').each(function () {
+            if ($(this).hasClass('repeating_header_row')) {
+                return;
+            }
+
             $(this).find('.data span').each(function () {
                 // Extract <em> tag for NULL values before converting to string to not mess up formatting
                 var data = $(this).find('em').length !== 0 ? $(this).find('em')[0] : this;
diff --git a/src/Dbal/DatabaseInterface.php b/src/Dbal/DatabaseInterface.php
@@ -1836,7 +1836,7 @@ public function isAmazonRds(): bool
      */
     public function getKillQuery(int $process): string
     {
-        if ($this->isAmazonRds()) {
+        if ($this->isAmazonRds() && $this->isSuperUser()) {
             return 'CALL mysql.rds_kill(' . $process . ');';
         }
 
diff --git a/src/Display/Results.php b/src/Display/Results.php
@@ -2410,7 +2410,7 @@ private function getColumnParams(StatementInfo $statementInfo): array
      */
     private function getRepeatingHeaders(): string
     {
-        $headerHtml = '<tr>' . "\n";
+        $headerHtml = '<tr class="repeating_header_row">' . "\n";
 
         if ($this->numEmptyColumnsBefore > 0) {
             $headerHtml .= '    <th colspan="'
diff --git a/src/I18n/LanguageManager.php b/src/I18n/LanguageManager.php
@@ -990,14 +990,6 @@ public function activate(Language $language): void
 
         self::$textDirection = $language->isRTL() ? TextDirection::RightToLeft : TextDirection::LeftToRight;
 
-        /* TCPDF settings and translations */
-        $GLOBALS['l'] = [
-            'a_meta_charset' => 'UTF-8',
-            'a_meta_dir' => self::$textDirection->value,
-            'a_meta_language' => $languageCode,
-            'w_page' => __('Page number:'),
-        ];
-
         /* Show possible warnings from language selection */
         $this->showWarnings();
     }
diff --git a/src/Pdf.php b/src/Pdf.php
@@ -9,6 +9,7 @@
 
 use DateTimeImmutable;
 use Exception;
+use PhpMyAdmin\I18n\LanguageManager;
 use TCPDF;
 use TCPDF_FONTS;
 
@@ -63,6 +64,12 @@ public function __construct(
         $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
         $this->setFont(self::PMA_PDF_FONT, '', 14);
         $this->setFooterFont([self::PMA_PDF_FONT, '', 14]);
+        $this->setLanguageArray([
+            'a_meta_charset' => 'UTF-8',
+            'a_meta_dir' => LanguageManager::$textDirection->value,
+            'a_meta_language' => Current::$lang,
+            'w_page' => __('Page number:'),
+        ]);
     }
 
     /**
diff --git a/src/Sql.php b/src/Sql.php
@@ -928,7 +928,7 @@ private function getQueryResponseForNoResultsReturned(
             $message = $this->getMessageForNoRowsReturned($messageToShow, $statementInfo, $numRows);
         }
 
-        $queryMessage = Generator::getMessage($message, Current::$sqlQuery, MessageType::Success);
+        $queryMessage = Generator::getMessage($message, $sqlQuery, MessageType::Success);
 
         if (isset(self::$showAsPhp)) {
             return $queryMessage;
diff --git a/src/Table/Table.php b/src/Table/Table.php
@@ -578,10 +578,10 @@ public static function generateFieldSpec(
         if ($virtuality === '' && $extra !== '') {
             if ($oldColumnName === null) {
                 if (is_array($columnsWithIndex) && ! in_array($name, $columnsWithIndex)) {
-                    $query .= ', add PRIMARY KEY (' . Util::backquote($name) . ')';
+                    $query .= ', ADD PRIMARY KEY (' . Util::backquote($name) . ')';
                 }
             } elseif (is_array($columnsWithIndex) && ! in_array($oldColumnName, $columnsWithIndex)) {
-                $query .= ', add PRIMARY KEY (' . Util::backquote($name) . ')';
+                $query .= ', ADD PRIMARY KEY (' . Util::backquote($name) . ')';
             }
         }
 
diff --git a/tests/unit/Table/TableTest.php b/tests/unit/Table/TableTest.php
@@ -808,7 +808,7 @@ public function testGenerateFieldSpec(): void
         // Add primary key for AUTO_INCREMENT if missing
         self::assertSame(
             '`ids` INT(11) PMA_attribute NULL AUTO_INCREMENT '
-            . "COMMENT 'PMA_comment' FIRST, add PRIMARY KEY (`ids`)",
+            . "COMMENT 'PMA_comment' FIRST, ADD PRIMARY KEY (`ids`)",
             $query,
         );
 
@@ -877,7 +877,7 @@ public function testGenerateFieldSpec(): void
         );
         // Add it beaucause it is missing
         self::assertSame(
-            '`ids` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST, add PRIMARY KEY (`ids`)',
+            '`ids` INT(11) PMA_attribute NULL DEF COMMENT \'PMA_comment\' FIRST, ADD PRIMARY KEY (`ids`)',
             $query,
         );
 

Original file line number	Diff line number	Diff line change
`@@ -1836,7 +1836,7 @@ public function isAmazonRds(): bool`
`1836`	`1836`	`*/`
`1837`	`1837`	`public function getKillQuery(int $process): string`
`1838`	`1838`	`{`
`1839`		`- if ($this->isAmazonRds()) {`
	`1839`	`+ if ($this->isAmazonRds() && $this->isSuperUser()) {`
`1840`	`1840`	`return 'CALL mysql.rds_kill(' . $process . ');';`
`1841`	`1841`	`}`
`1842`	`1842`
Original file line number	Diff line number	Diff line change
`@@ -2410,7 +2410,7 @@ private function getColumnParams(StatementInfo $statementInfo): array`
`2410`	`2410`	`*/`
`2411`	`2411`	`private function getRepeatingHeaders(): string`
`2412`	`2412`	`{`
`2413`		`- $headerHtml = '<tr>' . "\n";`
	`2413`	`+ $headerHtml = '<tr class="repeating_header_row">' . "\n";`
`2414`	`2414`
`2415`	`2415`	`if ($this->numEmptyColumnsBefore > 0) {`
`2416`	`2416`	`$headerHtml .= ' <th colspan="'`