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

Merge 6830a0a9d7 into 69093a00cc

Browse Source
This commit is contained in:
Eyüp Can Akman 2026-06-09 15:07:27 +03:00 committed by GitHub
commit a13055bc9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/Bookmark.php
View File

@ -250,7 +250,8 @@ class Bookmark
. " WHERE ( `user` = ''"
. " OR `user` = '" . $dbi->escapeString($user) . "' )";
if ($db !== false) {
$query .= " AND dbase = '" . $dbi->escapeString($db) . "'";
$query .= " AND ( dbase = ''"
. " OR dbase = '" . $dbi->escapeString($db) . "' )";
}
$query .= ' ORDER BY label ASC';
@ -308,7 +309,8 @@ class Bookmark
. ' WHERE ' . Util::backquote($id_field)
. " = '" . $dbi->escapeString((string) $id) . "'";
if ($db !== '') {
$query .= " AND dbase = '" . $dbi->escapeString($db) . "'";
$query .= " AND ( dbase = ''"
. " OR dbase = '" . $dbi->escapeString($db) . "' )";
}
if (! $action_bookmark_all) {

8
test/classes/BookmarkTest.php
View File

@ -36,8 +36,11 @@ class BookmarkTest extends AbstractTestCase
{
$this->dummyDbi->addResult(
'SELECT * FROM `phpmyadmin`.`pma_bookmark` WHERE ( `user` = \'\' OR `user` = \'root\' )'
. ' AND dbase = \'sakila\' ORDER BY label ASC',
[['1', 'sakila', 'root', 'label', 'SELECT * FROM `actor` WHERE `actor_id` < 10;']],
. ' AND ( dbase = \'\' OR dbase = \'sakila\' ) ORDER BY label ASC',
[
['1', 'sakila', 'root', 'sakila-only', 'SELECT * FROM `actor` WHERE `actor_id` < 10;'],
['2', '', 'root', 'shared', 'SELECT 1;'],
],
['id', 'dbase', 'user', 'label', 'query']
);
$actual = Bookmark::getList(
@ -47,6 +50,7 @@ class BookmarkTest extends AbstractTestCase
'sakila'
);
self::assertContainsOnlyInstancesOf(Bookmark::class, $actual);
self::assertCount(2, $actual);
$this->assertAllSelectsConsumed();
}

3
test/classes/Stubs/DbiDummy.php
View File

@ -2492,7 +2492,8 @@ class DbiDummy implements DbiExtension
],
[
'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE `label` = \'test_tbl\''
. ' AND dbase = \'my_db\' AND (user = \'user\') LIMIT 1',
. ' AND ( dbase = \'\' OR dbase = \'my_db\' )'
. ' AND (user = \'user\') LIMIT 1',
'result' => [],
],
[