Merge pull request #46 from TheDragonCode/3.x

Added support for `doctrine/dbal` and fix for Laravel 11

Author: andrey-helldar

.github/workflows/phpunit.yml

@@ -9,16 +9,22 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "8.0", "8.1", "8.2", "8.3" ]
+                php: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
                 laravel: [ "8.0", "9.0", "10.0", "11.0" ]
-                psql: [ "9", "10", "11", "12", "13", "14", "15" ]
+                psql: [ "9", "10", "11", "12", "13", "14", "15", "16", "17" ]
                 exclude:
                     - laravel: "8.0"
                       php: "8.3"
 
+                    - laravel: "8.0"
+                      php: "8.4"
+                      
                     - laravel: "9.0"
                       php: "8.3"
 
+                    - laravel: "9.0"
+                      php: "8.4"
+                      
                     - laravel: "10.0"
                       php: "8.0"
 

README.md

@@ -35,12 +35,12 @@ Or manually update `require-dev` block of `composer.json` and run `composer upda
 | Laravel   | ^8.0, ^9.0, ^10.0, ^11.0           |
 | Databases | MySQL 5.7+, PostgreSQL 9.5+, MSSQL |
 
-| Laravel \ PostgreSQL | 9  | 10 | 11 | 12 | 13 | 14 | 15 |
-|:---------------------|----|----|----|----|----|----|----|
-| 8                    | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
-| 9                    | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
-| 10                   | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
-| 11                   | ✖️ | ✖️ | ✖️ | ✅  | ✅  | ✅  | ✅  |
+| Laravel \ PostgreSQL | 9  | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 |
+|:---------------------|----|----|----|----|----|----|----|----|----|
+| 8                    | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
+| 9                    | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
+| 10                   | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
+| 11                   | ✖️ | ✖️ | ✖️ | ✅  | ✅  | ✅  | ✅  | ✅  | ✅  |
 
 
 ## Usage

composer.json

@@ -37,7 +37,7 @@
     "require": {
         "php": "^8.0",
         "ext-pdo": "*",
-        "doctrine/dbal": "^3.0",
+        "doctrine/dbal": "^3.0 || ^4.0",
         "dragon-code/contracts": "^2.15",
         "dragon-code/support": "^6.0",
         "illuminate/contracts": "^8.0 || ^9.0 || ^10.0 || ^11.0",

src/Console/Migrate.php

@@ -7,6 +7,7 @@
 use DragonCode\MigrateDB\Facades\BuilderManager;
 use DragonCode\Support\Facades\Helpers\Arr;
 use Illuminate\Console\Command;
+use Illuminate\Database\Connection;
 use Illuminate\Database\Query\Builder as QueryBuilder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -16,10 +17,10 @@
 class Migrate extends Command
 {
     protected $signature = 'db:migrate'
-                           . ' {--schema-from= : Source connection name}'
-                           . ' {--schema-to= : Target connection name}'
-                           . ' {--exclude=* : Comma separated table names to exclude}'
-                           . ' {--tables=* : Comma separated table names to migrate only}';
+        . ' {--schema-from= : Source connection name}'
+        . ' {--schema-to= : Target connection name}'
+        . ' {--exclude=* : Comma separated table names to exclude}'
+        . ' {--tables=* : Comma separated table names to migrate only}';
 
     protected $description = 'Data transfer from one database to another';
 
@@ -252,7 +253,10 @@ protected function getMigrationOption(): string
 
     protected function confirmTableListOption(): bool
     {
-        return $this->confirm('Please confirm table list should be retrieved from target connection? (incase if source connection does not support it)', false);
+        return $this->confirm(
+            'Please confirm table list should be retrieved from target connection? (incase if source connection does not support it)',
+            false
+        );
     }
 
     protected function confirmTruncateTableOption(): bool
@@ -311,7 +315,7 @@ protected function resolveOptions(): void
 
     protected function builder(string $connection, string $table): QueryBuilder
     {
-        return DB::connection($connection)->table($table);
+        return $this->connection($connection)->table($table);
     }
 
     protected function doesntHasTable(string $connection, string $table): bool
@@ -321,6 +325,15 @@ protected function doesntHasTable(string $connection, string $table): bool
 
     protected function getPrimaryKeyType(string $connection, string $table, string $column): string
     {
-        return DB::connection($connection)->getDoctrineColumn($table, $column)->getType()->getName();
+        if (method_exists($this->connection($connection), 'getDoctrineColumn')) {
+            return $this->connection($connection)->getDoctrineColumn($table, $column)->getType()->getName();
+        }
+
+        return $this->connection($connection)->getSchemaBuilder()->getColumnType($table, $column);
+    }
+
+    protected function connection(string $name): Connection
+    {
+        return DB::connection($name);
     }
 }

src/Database/Builder.php

@@ -24,7 +24,7 @@ public function __construct(Connection $connection)
     }
 
     /**
-     * @return \Illuminate\Database\Schema\Builder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder
+     * @return SchemaBuilder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder
      */
     public function schema(): SchemaBuilder
     {

src/Database/Manager.php

@@ -36,7 +36,7 @@ public function get(): BuilderContract
     }
 
     /**
-     * @return \DragonCode\MigrateDB\Database\Builder|string
+     * @return Builder|string
      */
     protected function getBuilder(): string
     {

tests/Concerns/Connections.php

@@ -18,15 +18,15 @@ abstract protected function defaultSourceConnectionName(): string;
     abstract protected function defaultTargetConnectionName(): string;
 
     /**
-     * @return \Illuminate\Database\Schema\Builder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder
+     * @return Builder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder
      */
     protected function sourceConnection(): Builder
     {
         return Schema::connection($this->source_connection);
     }
 
     /**
-     * @return \Illuminate\Database\Schema\Builder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder
+     * @return Builder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder
      */
     protected function targetConnection(): Builder
     {

tests/Configurations/Manager.php

@@ -23,7 +23,7 @@ public function get(string $driver): BaseConfiguration
     }
 
     /**
-     * @param  string|\Tests\Configurations\BaseConfiguration  $instance
+     * @param  string|BaseConfiguration  $instance
      */
     protected function resolve(string $instance): BaseConfiguration
     {