Merge branch 'main' into add-multi-organization-support

eiffel777 · web-flow · commit 597391396d83 · 2025-03-13T10:44:08.000-04:00
diff --git a/classes/ETL/Ingestor/StructuredFileIngestor.php b/classes/ETL/Ingestor/StructuredFileIngestor.php
@@ -346,12 +346,12 @@ function ($k, $v) {
             }
 
             $this->destinationHandle->commit();
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
+            $this->destinationHandle->rollback();
             $this->logAndThrowException(
-                "Error committing transaction. Rolling back transactions.",
+                "Error committing transaction. Rolling back transaction.",
                 array('exception' => $e, 'endpoint' => $this)
             );
-            $this->destinationHandle->rollback();
         }
 
         foreach ( $warnings as $table => $message) {

Original file line number	Diff line number	Diff line change
`@@ -346,12 +346,12 @@ function ($k, $v) {`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`$this->destinationHandle->commit();`
`349`		`- } catch (PDOException $e) {`
	`349`	`+ } catch (Exception $e) {`
	`350`	`+ $this->destinationHandle->rollback();`
`350`	`351`	`$this->logAndThrowException(`
`351`		`- "Error committing transaction. Rolling back transactions.",`
	`352`	`+ "Error committing transaction. Rolling back transaction.",`
`352`	`353`	`array('exception' => $e, 'endpoint' => $this)`
`353`	`354`	`);`
`354`		`- $this->destinationHandle->rollback();`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`foreach ( $warnings as $table => $message) {`