Merge pull request #19101 from kamil-tekiela/Fix-to-stop-processing-queries-on-error

MauricioFauth · web-flow · commit ba5533c2c2a7 · 2024-04-30T15:10:56.000-03:00
Fix to stop processing queries on error Fixes #19091 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
@@ -252,10 +252,15 @@ public function runQuery(
                     unset($sqlData['valid_full']);
                     for ($i = 0; $i < $count; $i++) {
                         $this->executeQuery($queries[$i], $fulls[$i], $sqlData);
+                        if ($GLOBALS['error']) {
+                            break;
+                        }
                     }
                 }
 
-                $this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);
+                if (! $GLOBALS['error']) {
+                    $this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);
+                }
             }
         } elseif (! empty($import_run_buffer['full'])) {
             if ($go_sql) {
diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php
@@ -161,6 +161,10 @@ public function doImport(?File $importHandle = null, array &$sql_data = []): voi
             $this->import->runQuery($statement, $statement, $sql_data);
         }
 
+        if ($GLOBALS['error']) {
+            return;
+        }
+
         // Finishing.
         $this->import->runQuery('', '', $sql_data);
     }

Original file line number	Diff line number	Diff line change
`@@ -252,10 +252,15 @@ public function runQuery(`
`252`	`252`	`unset($sqlData['valid_full']);`
`253`	`253`	`for ($i = 0; $i < $count; $i++) {`
`254`	`254`	`$this->executeQuery($queries[$i], $fulls[$i], $sqlData);`
	`255`	`+ if ($GLOBALS['error']) {`
	`256`	`+ break;`
	`257`	`+ }`
`255`	`258`	`}`
`256`	`259`	`}`
`257`	`260`
`258`		`- $this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);`
	`261`	`+ if (! $GLOBALS['error']) {`
	`262`	`+ $this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);`
	`263`	`+ }`
`259`	`264`	`}`
`260`	`265`	`} elseif (! empty($import_run_buffer['full'])) {`
`261`	`266`	`if ($go_sql) {`
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,10 @@ public function doImport(?File $importHandle = null, array &$sql_data = []): voi`
`161`	`161`	`$this->import->runQuery($statement, $statement, $sql_data);`
`162`	`162`	`}`
`163`	`163`
	`164`	`+ if ($GLOBALS['error']) {`
	`165`	`+ return;`
	`166`	`+ }`
	`167`	`+`
`164`	`168`	`// Finishing.`
`165`	`169`	`$this->import->runQuery('', '', $sql_data);`
`166`	`170`	`}`