Merge branch '10.x' into 11.x

# Conflicts: # CHANGELOG.md # src/Illuminate/Foundation/Application.php
illuminate · Jun 21, 2024 · 9c7ca00 · 9c7ca00
2 parents d68f493 + b8aca98
commit 9c7ca00
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/Schema/MySqlSchemaState.php b/Schema/MySqlSchemaState.php
@@ -26,7 +26,9 @@ public function dump(Connection $connection, $path)
 
         $this->removeAutoIncrementingState($path);
 
-        $this->appendMigrationData($path);
+        if ($this->hasMigrationTable()) {
+            $this->appendMigrationData($path);
+        }
     }
 
     /**

diff --git a/Schema/PostgresSchemaState.php b/Schema/PostgresSchemaState.php
@@ -17,9 +17,12 @@ public function dump(Connection $connection, $path)
     {
         $commands = collect([
             $this->baseDumpCommand().' --schema-only > '.$path,
-            $this->baseDumpCommand().' -t '.$this->migrationTable.' --data-only >> '.$path,
         ]);
 
+        if ($this->hasMigrationTable()) {
+            $commands->push($this->baseDumpCommand().' -t '.$this->migrationTable.' --data-only >> '.$path);
+        }
+
         $commands->map(function ($command, $path) {
             $this->makeProcess($command)->mustRun($this->output, array_merge($this->baseVariables($this->connection->getConfig()), [
                 'LARAVEL_LOAD_PATH' => $path,

diff --git a/Schema/SchemaState.php b/Schema/SchemaState.php
@@ -94,6 +94,16 @@ public function makeProcess(...$arguments)
         return call_user_func($this->processFactory, ...$arguments);
     }
 
+    /**
+     * Determine if the current connection has a migration table.
+     *
+     * @return bool
+     */
+    public function hasMigrationTable(): bool
+    {
+        return $this->connection->getSchemaBuilder()->hasTable($this->migrationTable);
+    }
+
     /**
      * Specify the name of the application's migration table.
      *

diff --git a/Schema/SqliteSchemaState.php b/Schema/SqliteSchemaState.php
@@ -28,7 +28,9 @@ public function dump(Connection $connection, $path)
 
         $this->files->put($path, implode(PHP_EOL, $migrations).PHP_EOL);
 
-        $this->appendMigrationData($path);
+        if ($this->hasMigrationTable()) {
+            $this->appendMigrationData($path);
+        }
     }
 
     /**