Merge branch 'master' of https://github.com/familytree365/laravel-gedcom

Author: curtisdelicata

src/Utils/GedcomParser.php

@@ -12,9 +12,9 @@
 use FamilyTree365\LaravelGedcom\Utils\Importer\Sour;
 use FamilyTree365\LaravelGedcom\Utils\Importer\Subm;
 use FamilyTree365\LaravelGedcom\Utils\Importer\Subn;
+use Gedcom\Parser;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Facades\Log;
-use Gedcom\Parser;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\StreamOutput;
 

src/Utils/GedcomWriter.php

@@ -11,8 +11,8 @@
 use FamilyTree365\LaravelGedcom\Models\Source;
 use FamilyTree365\LaravelGedcom\Models\Subm;
 use FamilyTree365\LaravelGedcom\Models\Subn;
-use Illuminate\Console\OutputStyle;
 use Gedcom\Parser;
+use Illuminate\Console\OutputStyle;
 use Symfony\Component\Console\Input\StringInput;
 use Symfony\Component\Console\Output\StreamOutput;
 

src/migrations/2021_05_28_121021_add_index_key_people_table.php

@@ -13,9 +13,13 @@ class AddIndexKeyPeopleTable extends Migration
      */
     public function up()
     {
-        Schema::table('people', function (Blueprint $table) {
-            $table->index(['id', 'uid']);
-        });
+        if (Schema::hasTable('people')) {
+            Schema::table('people', function (Blueprint $table) {
+                if (Schema::hasColumn('people', 'uid')) {
+                    $table->index(['id', 'uid']);
+                }
+            });
+        }
     }
 
     /**
@@ -25,8 +29,12 @@ public function up()
      */
     public function down()
     {
-        Schema::table('people', function (Blueprint $table) {
-            $table->dropIndex(['id', 'uid']);
-        });
+        if (Schema::hasTable('people')) {
+            Schema::table('people', function (Blueprint $table) {
+                if (Schema::hasColumn('people', 'uid')) {
+                    $table->dropIndex(['id', 'uid']);
+                }
+            });
+        }
     }
 }