import x

src/App/SqlDataImporter.php

@@ -74,7 +74,7 @@ final class SqlDataImporter
 
             foreach ($pendingStatements as $statement) {
                 try {
-                    $this->pdo->exec($statement);
+                    $this->execStatementWithRecovery($statement);
                     $executed++;
                     $progressMade = true;
                 } catch (\Throwable $exception) {
@@ -93,7 +93,7 @@ final class SqlDataImporter
 
             if (!$progressMade) {
                 try {
-                    $this->pdo->exec($deferredStatements[0]);
+                    $this->execStatementWithRecovery($deferredStatements[0]);
                 } catch (\Throwable $exception) {
                     throw new \RuntimeException($deferredStatements[0], 0, $exception);
                 }
@@ -105,6 +105,30 @@ final class SqlDataImporter
         return $executed;
     }
 
+    private function execStatementWithRecovery(string $statement): void
+    {
+        if ($this->driver !== 'pgsql' || !$this->pdo->inTransaction()) {
+            $this->pdo->exec($statement);
+            return;
+        }
+
+        $savepoint = 'sql_import_' . substr(sha1($statement . microtime(true)), 0, 12);
+        $this->pdo->exec('SAVEPOINT ' . $savepoint);
+
+        try {
+            $this->pdo->exec($statement);
+            $this->pdo->exec('RELEASE SAVEPOINT ' . $savepoint);
+        } catch (\Throwable $exception) {
+            try {
+                $this->pdo->exec('ROLLBACK TO SAVEPOINT ' . $savepoint);
+                $this->pdo->exec('RELEASE SAVEPOINT ' . $savepoint);
+            } catch (\Throwable) {
+            }
+
+            throw $exception;
+        }
+    }
+
     private function shouldRetryDeferredImportStatement(\Throwable $exception, string $statement): bool
     {
         if ($this->driver !== 'pgsql') {