Add Support for Binary Import

Author: stefanzweifel

src/Commands/RestoreCommand.php

@@ -225,7 +225,7 @@ private function confirmRestoreProcess(PendingRestore $pendingRestore): bool
     protected function getBackupOptions(Collection $listOfBackups, int $labelLength): Collection
     {
         return $listOfBackups->mapWithKeys(fn ($backup): array => [
-            $backup['path'] => str_pad($backup['path'] . ' ', ($labelLength - strlen($backup['size'])), '.', STR_PAD_RIGHT) . ' ' . $backup['size'],
+            $backup['path'] => str_pad($backup['path'].' ', ($labelLength - strlen($backup['size'])), '.', STR_PAD_RIGHT).' '.$backup['size'],
         ]);
     }
 }

src/Databases/PostgreSql.php

@@ -24,19 +24,35 @@ public function getImportCommand(string $dumpFile, string $connection): string
         $dumper = DbDumperFactory::createFromConnection($connection);
         $dumper->getContentsOfCredentialsFile();
 
+        $username = config("database.connections.{$connection}.username");
+        $password = config("database.connections.{$connection}.password");
+        $host = config("database.connections.{$connection}.host");
+        $port = config("database.connections.{$connection}.port");
+        $database = config("database.connections.{$connection}.database");
         if (str($dumpFile)->endsWith('sql')) {
             return collect([
                 $this->dumpBinaryPath.'psql',
                 'postgresql://'.
-                urldecode(config("database.connections.{$connection}.username")).':'.
-                urlencode(config("database.connections.{$connection}.password")).'@'.
-                config("database.connections.{$connection}.host").':'.
-                config("database.connections.{$connection}.port").'/'.
-                config("database.connections.{$connection}.database"),
+                urldecode($username).':'.
+                urlencode($password).'@'.
+                $host.':'.
+                $port.'/'.
+                $database,
                 '< '.$dumpFile,
             ])->implode(' ');
         }
 
+        if ($this->isBinaryDump($dumpFile)) {
+            return sprintf(
+                'pg_restore --verbose --no-owner --host=%s --port=%s --username=%s --dbname=%s %s',
+                escapeshellarg($host),
+                escapeshellarg($port),
+                escapeshellarg($username),
+                escapeshellarg($database),
+                escapeshellarg($dumpFile)
+            );
+        }
+
         // @todo: Improve detection of compressed files
         $decompressCommand = match (File::extension($dumpFile)) {
             'gz' => "gunzip -c {$dumpFile}",
@@ -49,16 +65,23 @@ public function getImportCommand(string $dumpFile, string $connection): string
             '|',
             $this->dumpBinaryPath.'psql',
             'postgresql://'.
-            urldecode(config("database.connections.{$connection}.username")).':'.
-            urldecode(config("database.connections.{$connection}.password")).'@'.
-            config("database.connections.{$connection}.host").':'.
-            config("database.connections.{$connection}.port").'/'.
-            config("database.connections.{$connection}.database"),
+            urldecode($username).':'.
+            urldecode($password).'@'.
+            $host.':'.
+            $port.'/'.
+            $database,
         ])->implode(' ');
     }
 
     public function getCliName(): string
     {
         return 'psql';
     }
+
+    public function isBinaryDump(string $dumpFile): bool
+    {
+        return str($dumpFile)->endsWith([
+            '.backup',
+        ]);
+    }
 }

tests/Commands/RestoreCommandTest.php

@@ -4,11 +4,14 @@
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
 use Wnx\LaravelBackupRestore\Commands\RestoreCommand;
 use Wnx\LaravelBackupRestore\Events\DatabaseReset;
 use Wnx\LaravelBackupRestore\Events\LocalBackupRemoved;
 use Wnx\LaravelBackupRestore\Exceptions\NoBackupsFound;
 
+use function Pest\Laravel\artisan;
+
 // MySQL
 it('restores mysql database', function (string $backup, ?string $password = null) {
     $this->artisan(RestoreCommand::class, [
@@ -192,13 +195,17 @@
         ->assertSuccessful();
 
     Event::assertNotDispatched(LocalBackupRemoved::class);
-    $files = \Illuminate\Support\Facades\Storage::disk('local')->allFiles('backup-restore-temp');
+    $files = Storage::disk('local')->allFiles('backup-restore-temp');
 
     expect($files)->not->toBeEmpty();
 
 })->group('sqlite');
 
 it('restores pgsql database with binary dump', function (string $backup, ?string $password = null) {
+    artisan('db:wipe', [
+        '--database' => 'pgsql-restore',
+    ]);
+
     config([
         'backup.backup.database_dump_file_extension' => 'backup',
     ]);
@@ -216,6 +223,10 @@
     $result = DB::connection('pgsql')->table('users')->count();
 
     expect($result)->toBe(1);
+
+    artisan('db:wipe', [
+        '--database' => 'pgsql-restore',
+    ]);
 })->with([
     [
         'backup' => 'Laravel/2025-12-26-pgsql-no-compression-custom-extension-binary-dump.zip',