Small fixes

Author: Andrey Helldar

composer.json

@@ -22,11 +22,11 @@
     },
     "require": {
         "php": "^7.2.5|^8.0",
-        "illuminate/support": "^7.0|^8.0",
-        "illuminate/database": "^7.0|^8.0"
+        "andrey-helldar/support": "^2.15",
+        "illuminate/database": "^7.0|^8.0",
+        "illuminate/support": "^7.0|^8.0"
     },
     "require-dev": {
-        "andrey-helldar/support": "^2.15",
         "mockery/mockery": "^1.0",
         "orchestra/testbench": "^5.0|^6.0",
         "phpunit/phpunit": "^9.0"

src/Builders/BaseBuilder.php

@@ -3,20 +3,21 @@
 namespace Helldar\MigrateDB\Builders;
 
 use Helldar\MigrateDB\Contracts\Database\Builder;
+use Helldar\Support\Concerns\Makeable;
 use Illuminate\Database\Schema\Builder as SchemaBuilder;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
 use stdClass;
 
 abstract class BaseBuilder implements Builder
 {
+    use Makeable;
+
     protected $connection;
 
-    public function connection(string $name): Builder
+    public function __construct(string $connection)
     {
-        $this->connection = $name;
-
-        return $this;
+        $this->connection = $connection;
     }
 
     public function schema(): SchemaBuilder

src/Console/Migrate.php

@@ -5,6 +5,7 @@
 use Helldar\MigrateDB\Contracts\Database\Builder as BuilderContract;
 use Helldar\MigrateDB\Exceptions\InvalidArgumentException;
 use Helldar\MigrateDB\Facades\BuilderManager;
+use Helldar\Support\Facades\Helpers\Arr;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -50,9 +51,11 @@ protected function migrateTable(string $table, string $column): void
             ->table($table)
             ->orderBy($column)
             ->chunk(1000, function (Collection $items) use ($table) {
+                $items = Arr::toArray($items);
+
                 DB::connection($this->target())
                     ->table($table)
-                    ->insert($items->toArray());
+                    ->insert($items);
             });
     }
 

src/Contracts/Database/Builder.php

@@ -6,7 +6,7 @@
 
 interface Builder
 {
-    public function connection(string $name): self;
+    public function __construct(string $connection);
 
     /**
      * @return \Illuminate\Database\Schema\Builder|\Illuminate\Database\Schema\MySqlBuilder|\Illuminate\Database\Schema\PostgresBuilder

src/Exceptions/InvalidArgumentException.php

@@ -6,8 +6,8 @@
 
 final class InvalidArgumentException extends BaseException
 {
-    public function __construct(string $key)
+    public function __construct(string $driver)
     {
-        parent::__construct('The "' . $key . '" option does not exist.');
+        parent::__construct('The "' . $driver . '" option does not exist.');
     }
 }

src/Exceptions/UnknownDatabaseDriverException.php

@@ -6,8 +6,8 @@
 
 final class UnknownDatabaseDriverException extends BaseException
 {
-    public function __construct(string $key)
+    public function __construct(string $driver)
     {
-        parent::__construct('Unknown database driver: "' . $key . '".');
+        parent::__construct('Database connection [' . $driver . '] not configured.');
     }
 }

src/Support/BuilderManager.php

@@ -20,17 +20,20 @@ public function of(string $connection): self
 
     public function resolve(): Builder
     {
-        switch ($this->getType()) {
+        $type       = $this->getType();
+        $connection = $this->connection;
+
+        switch ($type) {
             case 'mysql':
-                return new MySQLBuilder();
+                return MySQLBuilder::make($connection);
 
             default:
-                throw new UnknownDatabaseDriverException($this->getType());
+                throw new UnknownDatabaseDriverException($type);
         }
     }
 
-    protected function getType(): string
+    protected function getType(): ?string
     {
-        return Config::get("database.connections.{$this->connection}.driver");
+        return Config::get("database.connections.{$this->connection}.driver", $this->connection);
     }
 }

tests/Unit/MigrateTest.php

@@ -3,9 +3,9 @@
 namespace Tests\Unit;
 
 use Helldar\MigrateDB\Exceptions\InvalidArgumentException;
+use Helldar\MigrateDB\Exceptions\UnknownDatabaseDriverException;
 use Helldar\Support\Facades\Helpers\Arr;
 use Illuminate\Support\Facades\DB;
-use InvalidArgumentException as BaseInvalidArgumentException;
 use Tests\TestCase;
 
 final class MigrateTest extends TestCase
@@ -125,15 +125,15 @@ public function testToFailed()
 
     public function testFailedFromConnectionName()
     {
-        $this->expectException(BaseInvalidArgumentException::class);
+        $this->expectException(UnknownDatabaseDriverException::class);
         $this->expectExceptionMessage('Database connection [qwerty] not configured.');
 
         $this->artisan('db:migrate', ['--schema-from' => 'qwerty', '--schema-to' => $this->target])->run();
     }
 
     public function testFailedToConnectionName()
     {
-        $this->expectException(BaseInvalidArgumentException::class);
+        $this->expectException(UnknownDatabaseDriverException::class);
         $this->expectExceptionMessage('Database connection [qwerty] not configured.');
 
         $this->artisan('db:migrate', ['--schema-from' => $this->source, '--schema-to' => 'qwerty'])->run();