Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 71fac7eb4c99 · 2024-09-06T11:35:28.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/src/Controllers/Table/Structure/SaveController.php b/src/Controllers/Table/Structure/SaveController.php
@@ -391,7 +391,7 @@ private function adjustColumnPrivileges(UserPrivileges $userPrivileges, array $a
 
             if ($changed) {
                 // Finally FLUSH the new privileges
-                $this->dbi->query('FLUSH PRIVILEGES;');
+                $this->dbi->tryQuery('FLUSH PRIVILEGES;');
             }
         }
 
diff --git a/src/Database/Routines.php b/src/Database/Routines.php
@@ -262,8 +262,7 @@ public function flushPrivileges(bool $flushPrivileges): Message
     {
         if ($flushPrivileges) {
             // Flush the Privileges
-            $flushPrivQuery = 'FLUSH PRIVILEGES;';
-            $this->dbi->query($flushPrivQuery);
+            $this->dbi->tryQuery('FLUSH PRIVILEGES;');
 
             $message = Message::success(
                 __(
diff --git a/src/Operations.php b/src/Operations.php
@@ -333,7 +333,7 @@ public function adjustPrivilegesMoveDb(
             . ' where Db = ' . $this->dbi->quoteString($oldDb) . ';');
 
         // Finally FLUSH the new privileges
-        $this->dbi->query('FLUSH PRIVILEGES;');
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
@@ -431,7 +431,7 @@ public function adjustPrivilegesCopyDb(
         }
 
         // Finally FLUSH the new privileges
-        $this->dbi->query('FLUSH PRIVILEGES;');
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
@@ -774,7 +774,7 @@ public function adjustPrivilegesRenameOrMoveTable(
             . ';');
 
         // Finally FLUSH the new privileges
-        $this->dbi->query('FLUSH PRIVILEGES;');
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
@@ -833,7 +833,7 @@ public function adjustPrivilegesCopyTable(
         }
 
         // Finally FLUSH the new privileges
-        $this->dbi->query('FLUSH PRIVILEGES;');
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
diff --git a/src/Server/Privileges.php b/src/Server/Privileges.php
@@ -2166,8 +2166,7 @@ public function updateMessageForReload(): Message|null
     {
         $message = null;
         if (isset($_GET['flush_privileges'])) {
-            $sqlQuery = 'FLUSH PRIVILEGES;';
-            $this->dbi->query($sqlQuery);
+            $this->dbi->tryQuery('FLUSH PRIVILEGES;');
             $message = Message::success(
                 __('The privileges were reloaded successfully.'),
             );

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ private function adjustColumnPrivileges(UserPrivileges $userPrivileges, array $a`
`391`	`391`
`392`	`392`	`if ($changed) {`
`393`	`393`	`// Finally FLUSH the new privileges`
`394`		`- $this->dbi->query('FLUSH PRIVILEGES;');`
	`394`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`
Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ public function flushPrivileges(bool $flushPrivileges): Message`
`262`	`262`	`{`
`263`	`263`	`if ($flushPrivileges) {`
`264`	`264`	`// Flush the Privileges`
`265`		`- $flushPrivQuery = 'FLUSH PRIVILEGES;';`
`266`		`- $this->dbi->query($flushPrivQuery);`
	`265`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`267`	`266`
`268`	`267`	`$message = Message::success(`
`269`	`268`	`__(`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ public function adjustPrivilegesMoveDb(`
`333`	`333`	`. ' where Db = ' . $this->dbi->quoteString($oldDb) . ';');`
`334`	`334`
`335`	`335`	`// Finally FLUSH the new privileges`
`336`		`- $this->dbi->query('FLUSH PRIVILEGES;');`
	`336`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`/**`
`@@ -431,7 +431,7 @@ public function adjustPrivilegesCopyDb(`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`// Finally FLUSH the new privileges`
`434`		`- $this->dbi->query('FLUSH PRIVILEGES;');`
	`434`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`/**`
`@@ -774,7 +774,7 @@ public function adjustPrivilegesRenameOrMoveTable(`
`774`	`774`	`. ';');`
`775`	`775`
`776`	`776`	`// Finally FLUSH the new privileges`
`777`		`- $this->dbi->query('FLUSH PRIVILEGES;');`
	`777`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`778`	`778`	`}`
`779`	`779`
`780`	`780`	`/**`
`@@ -833,7 +833,7 @@ public function adjustPrivilegesCopyTable(`
`833`	`833`	`}`
`834`	`834`
`835`	`835`	`// Finally FLUSH the new privileges`
`836`		`- $this->dbi->query('FLUSH PRIVILEGES;');`
	`836`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`/**`