gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Undefined global variable $col_priv (#19511)

Browse Source 
* Fix query

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix Undefined global variable $col_priv

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix test

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Update libraries/classes/Normalization.php

Co-authored-by: Maurício Meneghini Fauth <mauricio@mfauth.net>

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Co-authored-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Liviu-Mihail Concioiu 2025-01-13 18:49:00 +01:00 committed by GitHub
parent 580a7b1adf
commit 01013880df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/classes/Normalization.php
View File

@ -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,
]);

4
libraries/classes/Table.php
View File

@ -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) . ')';
}
}
}

4
test/classes/TableTest.php
View File

@ -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
);