Creating multiple SchemaBuilder implementations to allow interop with…

… newer Framework changes.

src/Migrator/SnapshotSchemaBuilder.php → src/Concerns/HasVersionedSchema.php

@@ -1,23 +1,19 @@
 <?php
 
-namespace Plank\Snapshots\Migrator;
+namespace Plank\Snapshots\Concerns;
 
 use Closure;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Schema\Builder;
 use InvalidArgumentException;
 use Plank\Snapshots\Contracts\ManagesCreatedTables;
 use Plank\Snapshots\Contracts\ManagesVersions;
 use Plank\Snapshots\Contracts\Version;
 use Plank\Snapshots\Contracts\Versioned;
 use Plank\Snapshots\Events\TableCreated;
+use Plank\Snapshots\Migrator\SnapshotBlueprint;
 
-/**
- * @mixin Builder
- */
-class SnapshotSchemaBuilder extends Builder
+trait HasVersionedSchema
 {
     public function __construct(
         Connection $connection,
@@ -170,56 +166,81 @@ public function hasColumns($table, array $columns): bool
     /**
      * {@inheritDoc}
      */
-    public function whenTableHasColumn(string $table, string $column, Closure $callback)
+    public function dropColumns($table, $columns): void
     {
-        if ($this->hasColumn($table, $column)) {
-            $this->table($table, fn (Blueprint $table) => $callback($table));
+        if ($active = $this->versions->active()) {
+            $table = $active->addTablePrefix($table);
         }
+
+        parent::dropColumns($table, $columns);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function whenTableDoesntHaveColumn(string $table, string $column, Closure $callback)
+    public function getColumnType($table, $column, $fullDefinition = false)
     {
-        if (! $this->hasColumn($table, $column)) {
-            $this->table($table, fn (Blueprint $table) => $callback($table));
+        if ($active = $this->versions->active()) {
+            $table = $active->addTablePrefix($table);
         }
+
+        return parent::getColumnType($table, $column, $fullDefinition);
     }
 
     /**
      * {@inheritDoc}
      */
-    public function dropColumns($table, $columns): void
+    public function getColumnListing($table): array
     {
         if ($active = $this->versions->active()) {
             $table = $active->addTablePrefix($table);
         }
 
-        parent::dropColumns($table, $columns);
+        return parent::getColumnListing($table);
     }
 
     /**
-     * {@inheritDoc}
+     * Get the columns for a given table.
+     *
+     * @param  string  $table
+     * @return array
      */
-    public function getColumnType($table, $column, $fullDefinition = false)
+    public function getColumns($table)
     {
         if ($active = $this->versions->active()) {
             $table = $active->addTablePrefix($table);
         }
 
-        return parent::getColumnType($table, $column, $fullDefinition);
+        return parent::getColumns($table);
     }
 
     /**
-     * {@inheritDoc}
+     * Get the indexes for a given table.
+     *
+     * @param  string  $table
+     * @return array
      */
-    public function getColumnListing($table): array
+    public function getIndexes($table)
     {
         if ($active = $this->versions->active()) {
             $table = $active->addTablePrefix($table);
         }
 
-        return parent::getColumnListing($table);
+        return parent::getIndexes($table);
+    }
+
+    /**
+     * Get the foreign keys for a given table.
+     *
+     * @param  string  $table
+     * @return array
+     */
+    public function getForeignKeys($table)
+    {
+        if ($active = $this->versions->active()) {
+            $table = $active->addTablePrefix($table);
+        }
+
+        return parent::getForeignKeys($table);
     }
 }

src/Contracts/VersionedSchema.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Plank\Snapshots\Contracts;
+
+use Closure;
+
+interface VersionedSchema
+{
+    /**
+     * Create a new table on the schema.
+     *
+     * @param  class-string<Model>  $model
+     */
+    public function createForModel(string $model, Closure $callback): void;
+
+    /**
+     * Create a new table on the schema.
+     *
+     * @param  class-string<Model>  $model
+     * @param  \Closure  $callback
+     */
+    public function dropForModel($model): void;
+}

src/Facades/SnapshotSchema.php

@@ -2,8 +2,9 @@
 
 namespace Plank\Snapshots\Facades;
 
+use Illuminate\Database\Schema\Builder;
 use Illuminate\Support\Facades\Facade;
-use Plank\Snapshots\Migrator\SnapshotSchemaBuilder;
+use Plank\Snapshots\Contracts\VersionedSchema;
 
 /**
  * @method static void defaultStringLength(int $length)
@@ -38,7 +39,7 @@
  * @method static \Illuminate\Database\Connection getConnection()
  * @method static \Illuminate\Database\Schema\Builder setConnection(\Illuminate\Database\Connection $connection)
  * @method static void blueprintResolver(\Closure $resolver)
- *
+ * @method static Builder&VersionedSchema getFacadeRoot()
  * @see \Illuminate\Database\Schema\Builder
  */
 class SnapshotSchema extends Facade
@@ -57,6 +58,6 @@ class SnapshotSchema extends Facade
      */
     protected static function getFacadeAccessor()
     {
-        return SnapshotSchemaBuilder::class;
+        return VersionedSchema::class;
     }
 }

src/Factory/SchemaBuilderFactory.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Plank\Snapshots\Factory;
+
+use Illuminate\Database\Connection;
+use Illuminate\Database\Schema\Builder;
+use Illuminate\Database\Schema\MySqlBuilder;
+use Illuminate\Database\Schema\PostgresBuilder;
+use Illuminate\Database\Schema\SQLiteBuilder;
+use Illuminate\Database\Schema\SqlServerBuilder;
+use Plank\Snapshots\Contracts\ManagesCreatedTables;
+use Plank\Snapshots\Contracts\ManagesVersions;
+use Plank\Snapshots\Contracts\VersionedSchema;
+use Plank\Snapshots\Schema\MySqlSnapshotBuilder;
+use Plank\Snapshots\Schema\PostgresSnapshotBuilder;
+use Plank\Snapshots\Schema\SnapshotSchemaBuilder;
+use Plank\Snapshots\Schema\SQLiteSnapshotBuilder;
+use Plank\Snapshots\Schema\SqlServerSnapshotBuilder;
+
+class SchemaBuilderFactory
+{
+    public static function make(
+        Connection $connection,
+        ManagesVersions $versions,
+        ManagesCreatedTables $tables,
+    ): Builder&VersionedSchema {
+        return match(get_class($connection->getSchemaBuilder())) {
+            MySqlBuilder::class => new MySqlSnapshotBuilder($connection, $versions, $tables),
+            PostgresBuilder::class => new PostgresSnapshotBuilder($connection, $versions, $tables),
+            SQLiteBuilder::class => new SQLiteSnapshotBuilder($connection, $versions, $tables),
+            SqlServerBuilder::class => new SqlServerSnapshotBuilder($connection, $versions, $tables),
+            default => new SnapshotSchemaBuilder($connection, $versions, $tables),
+        };
+    }
+}

src/Migrator/SnapshotMigration.php

@@ -3,11 +3,13 @@
 namespace Plank\Snapshots\Migrator;
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Builder;
+use Plank\Snapshots\Contracts\VersionedSchema;
 use Plank\Snapshots\Facades\SnapshotSchema;
 
 abstract class SnapshotMigration extends Migration
 {
-    public SnapshotSchemaBuilder $schema;
+    public Builder&VersionedSchema $schema;
 
     /**
      * Create a new migration instance.

src/Schema/MySqlSnapshotBuilder.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Plank\Snapshots\Schema;
+
+use Illuminate\Database\Schema\MySqlBuilder;
+use Plank\Snapshots\Concerns\HasVersionedSchema;
+use Plank\Snapshots\Contracts\VersionedSchema;
+
+class MySqlSnapshotBuilder extends MySqlBuilder implements VersionedSchema
+{
+    use HasVersionedSchema;
+}

src/Schema/PostgresSnapshotBuilder.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Plank\Snapshots\Schema;
+
+use Illuminate\Database\Schema\PostgresBuilder;
+use Plank\Snapshots\Concerns\HasVersionedSchema;
+use Plank\Snapshots\Contracts\VersionedSchema;
+
+class PostgresSnapshotBuilder extends PostgresBuilder implements VersionedSchema
+{
+    use HasVersionedSchema;
+}

src/Schema/SQLiteSnapshotBuilder.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Plank\Snapshots\Schema;
+
+use Illuminate\Database\Schema\SQLiteBuilder;
+use Plank\Snapshots\Concerns\HasVersionedSchema;
+use Plank\Snapshots\Contracts\VersionedSchema;
+
+class SQLiteSnapshotBuilder extends SQLiteBuilder implements VersionedSchema
+{
+    use HasVersionedSchema;
+}

src/Schema/SnapshotSchemaBuilder.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Plank\Snapshots\Schema;
+
+use Illuminate\Database\Schema\Builder;
+use Plank\Snapshots\Concerns\HasVersionedSchema;
+use Plank\Snapshots\Contracts\VersionedSchema;
+
+/**
+ * @mixin Builder
+ */
+class SnapshotSchemaBuilder extends Builder implements VersionedSchema
+{
+    use HasVersionedSchema;
+}

src/Schema/SqlServerSnapshotBuilder.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Plank\Snapshots\Schema;
+
+use Illuminate\Database\Schema\SqlServerBuilder;
+use Plank\Snapshots\Concerns\HasVersionedSchema;
+use Plank\Snapshots\Contracts\VersionedSchema;
+
+class SqlServerSnapshotBuilder extends SqlServerBuilder implements VersionedSchema
+{
+    use HasVersionedSchema;
+}

src/SnapshotServiceProvider.php

@@ -10,11 +10,12 @@
 use Plank\Snapshots\Contracts\ManagesVersions;
 use Plank\Snapshots\Contracts\ResolvesCauser;
 use Plank\Snapshots\Contracts\Version;
+use Plank\Snapshots\Contracts\VersionedSchema;
 use Plank\Snapshots\Events\TableCopied;
 use Plank\Snapshots\Events\VersionCreated;
 use Plank\Snapshots\Exceptions\VersionException;
+use Plank\Snapshots\Factory\SchemaBuilderFactory;
 use Plank\Snapshots\Migrator\SnapshotMigrator;
-use Plank\Snapshots\Migrator\SnapshotSchemaBuilder;
 use Spatie\LaravelPackageTools\Commands\InstallCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -115,19 +116,18 @@ protected function bindRepositories(): self
 
     protected function bindSchemaBuilder(): self
     {
-        if (! $this->app->bound(SnapshotSchemaBuilder::class)) {
-            $this->app->scoped(SnapshotSchemaBuilder::class, function (Application $app) {
-                $schema = $this->app['db']->connection()->getSchemaBuilder();
-                $connection = $schema->getConnection();
-
-                return new SnapshotSchemaBuilder(
-                    $connection,
-                    $app[ManagesVersions::class],
-                    $app[ManagesCreatedTables::class]
-                );
-            });
+        if ($this->app->bound(VersionedSchema::class)) {
+            return $this;
         }
 
+        $this->app->scoped(VersionedSchema::class, function (Application $app) {
+            return SchemaBuilderFactory::make(
+                $app['db.connection'],
+                $app[ManagesVersions::class],
+                $app[ManagesCreatedTables::class],
+            );
+        });
+
         return $this;
     }