From 3849b55c50a53bc3b7fe7f1385af36261f669b62 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Mon, 4 Dec 2017 15:35:39 -0600
Subject: [PATCH] match up db named/seeder to installer names/env names

---
 config/app.php                    |  3 +--
 config/database.php               |  8 +++++++-
 config/installer.php              | 10 +++++-----
 database/seeds/DatabaseSeeder.php | 17 ++++++++++++++---
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/config/app.php b/config/app.php
index baeabae2..206f58dd 100755
--- a/config/app.php
+++ b/config/app.php
@@ -62,6 +62,7 @@ return [
         Spatie\Fractal\FractalServiceProvider::class,
         SebastiaanLuca\Helpers\Methods\GlobalHelpersServiceProvider::class,
         SebastiaanLuca\Helpers\Collections\CollectionMacrosServiceProvider::class,
+        Toin0u\Geotools\GeotoolsServiceProvider::class,
 
         /*
          * Application Service Providers...
@@ -71,8 +72,6 @@ return [
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-
-        Toin0u\Geotools\GeotoolsServiceProvider::class,
     ],
 
     'aliases' => [
diff --git a/config/database.php b/config/database.php
index 23429d99..46f1085e 100755
--- a/config/database.php
+++ b/config/database.php
@@ -21,9 +21,15 @@ return [
             'engine' => null,
         ],
 
+        'sqlite' => [
+            'driver' => 'sqlite',
+            'database' => storage_path('db.sqlite'),
+            'prefix' => '',
+        ],
+
         'local' => [
             'driver' => 'sqlite',
-            'database' => storage_path('testing.sqlite'),
+            'database' => storage_path('local.sqlite'),
             'prefix' => '',
         ],
 
diff --git a/config/installer.php b/config/installer.php
index 39be3b86..670fa91e 100644
--- a/config/installer.php
+++ b/config/installer.php
@@ -68,11 +68,11 @@ return [
                 'app_log_level'         => 'required|string|max:50',
                 'app_url'               => 'required|url',
                 'database_connection'   => 'required|string|max:50',
-                'database_hostname'     => 'required|string|max:50',
-                'database_port'         => 'required|numeric',
-                'database_name'         => 'required|string|max:50',
-                'database_username'     => 'required|string|max:50',
-                'database_password'     => 'required|string|max:50',
+                'database_hostname'     => 'string|max:50',
+                'database_port'         => 'numeric',
+                'database_name'         => 'string|max:50',
+                'database_username'     => 'string|max:50',
+                'database_password'     => 'string|max:50',
                 'broadcast_driver'      => 'string|max:50',
                 'cache_driver'          => 'string|max:50',
                 'session_driver'        => 'string|max:50',
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 2ffa99d2..8d1dedb0 100755
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -4,14 +4,26 @@ use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
+    /**
+     * Map these other environments to a specific seed file
+     * @var array
+     */
+    public static $seed_mapper = [
+        'local' =>      'dev',
+        'qa' =>         'dev',
+        'staging' =>    'dev',
+    ];
+
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
     public function run()
     {
         $env = App::environment();
+        if(in_array($env, self::$seed_mapper, true)) {
+            $env = self::$seed_mapper[$env];
+        }
+
         $path = database_path('seeds/'.$env.'.yml');
         print("Seeding seeds/$env.yml\n");
 
@@ -22,5 +34,4 @@ class DatabaseSeeder extends Seeder
         $svc = app('App\Services\DatabaseService');
         $svc->seed_from_yaml_file($path);
     }
-
 }