From 01013880dfa2b23897a96bc363b58cc954abe226 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Mon, 13 Jan 2025 18:49:00 +0100 Subject: [PATCH] Fix Undefined global variable $col_priv (#19511) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix query Signed-off-by: Liviu-Mihail Concioiu * Fix Undefined global variable $col_priv Signed-off-by: Liviu-Mihail Concioiu * Fix test Signed-off-by: Liviu-Mihail Concioiu * Update libraries/classes/Normalization.php Co-authored-by: Maurício Meneghini Fauth --------- Signed-off-by: Liviu-Mihail Concioiu Co-authored-by: Maurício Meneghini Fauth Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Normalization.php | 2 +- libraries/classes/Table.php | 4 ++-- test/classes/TableTest.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index 34b21b39e6..2a7e5c0dab 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -201,7 +201,7 @@ class Normalization 'max_rows' => intval($GLOBALS['cfg']['MaxRows']), 'char_editing' => $GLOBALS['cfg']['CharEditing'], 'attribute_types' => $this->dbi->types->getAttributes(), - 'privs_available' => $GLOBALS['col_priv'] && $GLOBALS['is_reload_priv'], + 'privs_available' => ($GLOBALS['col_priv'] ?? false) && ($GLOBALS['is_reload_priv'] ?? false), 'max_length' => $this->dbi->getVersion() >= 50503 ? 1024 : 255, 'charsets' => $charsetsList, ]); diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 7146fdf4bd..e08bdc42eb 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -672,11 +672,11 @@ class Table implements Stringable if (! $virtuality && ! empty($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) . ')'; } } else { if (is_array($columnsWithIndex) && ! in_array($oldColumnName, $columnsWithIndex)) { - $query .= ', add PRIMARY KEY (' . Util::backquote($name) . ')'; + $query .= ', ADD PRIMARY KEY (' . Util::backquote($name) . ')'; } } } diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index d964a62583..d849871cb1 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -773,7 +773,7 @@ class TableTest extends AbstractTestCase ); // 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`)", $query); + . "COMMENT 'PMA_comment' FIRST, ADD PRIMARY KEY (`ids`)", $query); $default_type = 'NONE'; $move_to = '-first'; @@ -840,7 +840,7 @@ class TableTest extends AbstractTestCase ); // 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 );