Merge pull request #18132 from kamil-tekiela/fix-after-merge

Fix merge issues
phpmyadmin · Feb 20, 2023 · bd095c7 · bd095c7
2 parents b0bc4f4 + c311b9f
commit bd095c7
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
@@ -295,13 +295,6 @@ protected function setUp(): void
         $dbi->expects($this->any())->method('getTablesFull')
             ->will($this->returnValue($databases));
 
-        $resultStub->expects($this->any())
-            ->method('numRows')
-            ->will($this->returnValue(20));
-
-        $dbi->expects($this->any())->method('tryQuery')
-            ->will($this->returnValue($resultStub));
-
         $dbi->expects($this->any())->method('query')
             ->will($this->returnValue($resultStub));
 
@@ -1533,6 +1526,20 @@ public function testMoveCopy(): void
                     true,
                     $resultStub,
                 ],
+                [
+                    'SHOW TABLE STATUS FROM `aa` WHERE Name = \'ad\'',
+                    Connection::TYPE_USER,
+                    DatabaseInterface::QUERY_BUFFERED,
+                    true,
+                    $resultStub,
+                ],
+                [
+                    'USE `aa`',
+                    Connection::TYPE_USER,
+                    DatabaseInterface::QUERY_BUFFERED,
+                    true,
+                    $resultStub,
+                ],
             ]));
         $resultStub->expects($this->any())
             ->method('fetchRow')