Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit baa687b8c77e · 2023-08-15T01:02:53.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
@@ -999,7 +999,7 @@ private function getQueryResponseForNoResultsReturned(
         $scripts = $header->getScripts();
         $scripts->addFile('sql.js');
 
-        if (! $statementInfo->isSelect || isset($extraData['error'])) {
+        if (($result instanceof ResultInterface && $result->numFields() === 0) || isset($extraData['error'])) {
             return $queryMessage;
         }
 
@@ -1646,10 +1646,6 @@ public function executeQueryAndGetQueryResponse(
             $extraData,
         );
 
-        if ($this->dbi->moreResults()) {
-            $this->dbi->nextResult();
-        }
-
         $warningMessages = $this->operations->getWarningMessagesArray();
 
         // No rows returned -> move back to the calling page
diff --git a/test/classes/Controllers/Import/ImportControllerTest.php b/test/classes/Controllers/Import/ImportControllerTest.php
@@ -67,6 +67,7 @@ public function testIndexParametrized(): void
             'SELECT A.* FROM table1 A WHERE A.nomEtablissement = \'Saint-Louis - Châteaulin\''
             . ' AND foo = 4 AND `:a` IS NULL LIMIT 0, 25',
             [],
+            ['nomEtablissement', 'foo'],
         );
 
         $this->dummyDbi->addResult(
diff --git a/test/selenium/CreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php
@@ -83,7 +83,8 @@ private function dropDatabase(): void
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $this->databaseName . '\';',
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
     }
diff --git a/test/selenium/Database/EventsTest.php b/test/selenium/Database/EventsTest.php
@@ -211,7 +211,8 @@ public function testDropEvent(): void
             'USE `' . $this->databaseName . '`;'
             . 'SHOW EVENTS WHERE Db=\'' . $this->databaseName . '\' AND Name=\'test_event\';',
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
     }
diff --git a/test/selenium/Database/OperationsTest.php b/test/selenium/Database/OperationsTest.php
@@ -82,7 +82,8 @@ function () use ($newDbName): void {
         $this->dbQuery(
             'SHOW DATABASES LIKE \'' . $this->databaseName . '\'',
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
 
diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php
@@ -205,7 +205,8 @@ public function testDropProcedure(): void
         $this->dbQuery(
             "SHOW PROCEDURE STATUS WHERE Db='" . $this->databaseName . "'",
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
     }
diff --git a/test/selenium/Database/StructureTest.php b/test/selenium/Database/StructureTest.php
@@ -85,7 +85,8 @@ public function testDropMultipleTables(): void
         $this->dbQuery(
             'SHOW TABLES FROM `' . $this->databaseName . '`;',
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
     }
diff --git a/test/selenium/Table/OperationsTest.php b/test/selenium/Table/OperationsTest.php
@@ -206,7 +206,8 @@ public function testDropTable(): void
             'USE `' . $this->databaseName . '`;'
             . 'SHOW TABLES',
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
     }
diff --git a/test/selenium/TriggersTest.php b/test/selenium/TriggersTest.php
@@ -193,7 +193,8 @@ function (): void {
         $this->dbQuery(
             'SHOW TRIGGERS FROM `' . $this->databaseName . '`;',
             function (): void {
-                $this->assertFalse($this->isElementPresent('className', 'table_results'));
+                $this->assertTrue($this->isElementPresent('className', 'table_results'));
+                $this->assertFalse($this->isElementPresent('cssSelector', '.table_results tbody tr'));
             },
         );
     }
