NativePHP
diff --git a/‎src/Commands/MigrateCommand.php
Lines changed: 27 additions & 0 deletions b/‎src/Commands/MigrateCommand.php
Lines changed: 27 additions & 0 deletions
diff --git a/‎src/NativeServiceProvider.php
Lines changed: 34 additions & 4 deletions b/‎src/NativeServiceProvider.php
Lines changed: 34 additions & 4 deletions
@@ -0,0 +1,27 @@
+<?php
+
+namespace Native\Laravel\Commands;
+
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Database\Migrations\Migrator;
+use Native\Laravel\NativeServiceProvider;
+use Illuminate\Database\Console\Migrations\MigrateCommand as BaseMigrateCommand;
+
+class MigrateCommand extends BaseMigrateCommand
+{
+    protected $description = 'Run the database migrations in the NativePHP development environment';
+
+    public function __construct(Migrator $migrator, Dispatcher $dispatcher)
+    {
+        $this->signature = 'native:'.$this->signature;
+
+        parent::__construct($migrator, $dispatcher);
+    }
+
+    public function handle()
+    {
+        (new NativeServiceProvider($this->laravel))->rewriteDatabase();
+
+        parent::handle();
+    }
+}
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Native\Laravel\Commands\LoadStartupConfigurationCommand;
+use Native\Laravel\Commands\MigrateCommand;
 use Native\Laravel\Commands\MinifyApplicationCommand;
 use Native\Laravel\Logging\LogWatcher;
 use Spatie\LaravelPackageTools\Package;
@@ -16,6 +17,7 @@ public function configurePackage(Package $package): void
         $package
             ->name('nativephp')
             ->hasCommands([
+                MigrateCommand::class,
                 MinifyApplicationCommand::class,
                 LoadStartupConfigurationCommand::class,
             ])
@@ -28,6 +30,10 @@ public function packageRegistered()
     {
         $this->mergeConfigFrom($this->package->basePath('/../config/nativephp-internal.php'), 'nativephp-internal');
 
+        $this->app->singleton(MigrateCommand::class, function ($app) {
+            return new MigrateCommand($app['migrator'], $app['events']);
+        });
+
         if (config('nativephp-internal.running')) {
             $this->configureApp();
         }
@@ -39,6 +45,20 @@ protected function configureApp()
             app(LogWatcher::class)->register();
         }
 
+        $this->rewriteStoragePath();
+
+        $this->rewriteDatabase();
+
+        config(['session.driver' => 'file']);
+        config(['queue.default' => 'database']);
+    }
+
+    protected function rewriteStoragePath()
+    {
+        if (config('app.debug')) {
+            return;
+        }
+
         $oldStoragePath = $this->app->storagePath();
 
         $this->app->useStoragePath(config('nativephp-internal.storage_path'));
@@ -52,18 +72,28 @@ protected function configureApp()
                 config([$key => $newValue]);
             }
         }
+    }
+
+    public function rewriteDatabase()
+    {
+        $databasePath = config('nativephp-internal.database_path');
+
+        if (config('app.debug')) {
+            $databasePath = database_path('nativephp.sqlite');
+
+            if (! file_exists($databasePath)) {
+                touch($databasePath);
+            }
+        }
 
         config(['database.connections.nativephp' => [
             'driver' => 'sqlite',
             'url' => env('DATABASE_URL'),
-            'database' => config('nativephp-internal.database_path'),
+            'database' => $databasePath,
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ]]);
 
         config(['database.default' => 'nativephp']);
-        config(['session.driver' => 'file']);
-
-        config(['queue.default' => 'database']);
     }
 }