Merge pull request #18718 from kamil-tekiela/deletebookmark60

MauricioFauth · web-flow · commit 880afc93c46c · 2023-09-19T11:43:40.000-03:00
Fix bookmark delete
diff --git a/src/Bookmark.php b/src/Bookmark.php
@@ -267,20 +267,19 @@ public static function getList(
     /**
      * Retrieve a specific bookmark
      *
-     * @param string       $user              Current user
-     * @param DatabaseName $db                the current database name
-     * @param int|string   $id                an identifier of the bookmark to get
-     * @param string       $idField           which field to look up the identifier
-     * @param bool         $actionBookmarkAll true: get all bookmarks regardless
-     *                                          of the owning user
-     * @param bool         $exactUserMatch    whether to ignore bookmarks with no user
+     * @param string            $user              Current user
+     * @param DatabaseName|null $db                the current database name
+     * @param int|string        $id                an identifier of the bookmark to get
+     * @param string            $idField           which field to look up the identifier
+     * @param bool              $actionBookmarkAll true: get all bookmarks regardless of the owning user
+     * @param bool              $exactUserMatch    whether to ignore bookmarks with no user
      *
      * @return Bookmark|null the bookmark
      */
     public static function get(
         DatabaseInterface $dbi,
         string $user,
-        DatabaseName $db,
+        DatabaseName|null $db,
         int|string $id,
         string $idField = 'id',
         bool $actionBookmarkAll = false,
@@ -298,7 +297,12 @@ public static function get(
 
         $query = 'SELECT * FROM ' . Util::backquote($bookmarkFeature->database)
             . '.' . Util::backquote($bookmarkFeature->bookmark)
-            . ' WHERE dbase = ' . $dbi->quoteString($db->getName());
+            . ' WHERE ' . Util::backquote($idField)
+            . ' = ' . $dbi->quoteString((string) $id);
+        if ($db !== null) {
+            $query .= ' AND dbase = ' . $dbi->quoteString($db->getName());
+        }
+
         if (! $actionBookmarkAll) {
             $query .= ' AND (user = ' . $dbi->quoteString($user);
             if (! $exactUserMatch) {
@@ -308,8 +312,7 @@ public static function get(
             $query .= ')';
         }
 
-        $query .= ' AND ' . Util::backquote($idField)
-            . ' = ' . $dbi->quoteString((string) $id) . ' LIMIT 1';
+        $query .= ' LIMIT 1';
 
         $result = $dbi->fetchSingleRow($query, DatabaseInterface::FETCH_ASSOC, Connection::TYPE_CONTROL);
         if ($result !== null) {
diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php
@@ -377,7 +377,7 @@ public function __invoke(ServerRequest $request): void
                     $bookmark = Bookmark::get(
                         $this->dbi,
                         $config->selectedServer['user'],
-                        DatabaseName::from($GLOBALS['db']),
+                        DatabaseName::tryFrom($GLOBALS['db']),
                         $idBookmark,
                     );
                     if (! $bookmark instanceof Bookmark) {
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
@@ -1745,8 +1745,8 @@ private function init(): void
             ['query' => 'SELECT LAST_INSERT_ID();', 'result' => []],
             ['query' => 'SHOW WARNINGS', 'result' => []],
             [
-                'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE dbase = \'my_db\''
-                . ' AND (user = \'user\') AND `label` = \'test_tbl\' LIMIT 1',
+                'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE `label` = \'test_tbl\''
+                . ' AND dbase = \'my_db\' AND (user = \'user\') LIMIT 1',
                 'result' => [],
             ],
             [

Original file line number	Diff line number	Diff line change
`@@ -1745,8 +1745,8 @@ private function init(): void`
`1745`	`1745`	`['query' => 'SELECT LAST_INSERT_ID();', 'result' => []],`
`1746`	`1746`	`['query' => 'SHOW WARNINGS', 'result' => []],`
`1747`	`1747`	`[`
`1748`		- 'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE dbase = \'my_db\''
`1749`		- . ' AND (user = \'user\') AND `label` = \'test_tbl\' LIMIT 1',
	`1748`	+ 'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE `label` = \'test_tbl\''
	`1749`	`+ . ' AND dbase = \'my_db\' AND (user = \'user\') LIMIT 1',`
`1750`	`1750`	`'result' => [],`
`1751`	`1751`	`],`
`1752`	`1752`	`[`