Fix constraints based on self

laramore · Jul 3, 2021 · bec1636 · bec1636
1 parent 75452f8
commit bec1636
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/resources/views/migration/block.blade.php b/resources/views/migration/block.blade.php
@@ -1,8 +1,14 @@
 Schema::{{ $type === 'create' ? $type : 'table' }}({!! json_encode($table) !!}, function (Blueprint {{ '$table' }}) {
-@foreach ($blocks as $block)
+@foreach ($blocks as $key => $block)
+@if ($key === 'self_constraints')		});
+
+		Schema::table({!! json_encode($table) !!}, function (Blueprint {{ '$table' }}) {
+			@include('laramore::migration.partials.commands', ['commands' => $block])
+@else
 @if (!$loop->first)
 
 @endif
 			@include('laramore::migration.partials.commands', ['commands' => $block])
+@endif
 @endforeach
 		});
diff --git a/src/Migrations/MetaNode.php b/src/Migrations/MetaNode.php
@@ -158,14 +158,19 @@ public function getCommands(): array
             'fields' => [],
             'constraints' => [],
             'indexes' => [],
+            'self_constraints' => [],
         ];
 
         foreach ($fieldCommands as $command) {
             $commands[($command instanceof IsADropCommand ? 'drop_fields' : 'fields')][] = $command;
         }
 
         foreach ($constraintCommands as $command) {
-            $commands[($command instanceof IsADropCommand ? 'drop_constraints' : 'constraints')][] = $command;
+            if (! ($command instanceof IsADropCommand) && $command->getTableName() === $command->getProperties()['on']) {
+                $commands['self_constraints'][] = $command;
+            } else {
+                $commands[($command instanceof IsADropCommand ? 'drop_constraints' : 'constraints')][] = $command;
+            }
         }
 
         foreach ($indexCommands as $command) {
@@ -208,14 +213,19 @@ public function getReverseCommands(): array
             'fields' => [],
             'constraints' => [],
             'indexes' => [],
+            'self_constraints' => [],
         ];
 
         foreach ($fieldCommands as $command) {
             $commands[($command instanceof IsADropCommand ? 'drop_fields' : 'fields')][] = $command;
         }
 
         foreach ($constraintCommands as $command) {
-            $commands[($command instanceof IsADropCommand ? 'drop_constraints' : 'constraints')][] = $command;
+            if (! ($command instanceof IsADropCommand) && $command->getTableName() === $command->getProperties()['on']) {
+                $commands['self_constraints'][] = $command;
+            } else {
+                $commands[($command instanceof IsADropCommand ? 'drop_constraints' : 'constraints')][] = $command;
+            }
         }
 
         foreach ($indexCommands as $command) {