conflict

Eloquent/Collection.php

@@ -48,7 +48,7 @@ public function load($relations)
                 $relations = func_get_args();
             }
 
-            $query = $this->first()->newQuery()->with($relations);
+            $query = $this->first()->newQueryWithoutRelationships()->with($relations);
 
             $this->items = $query->eagerLoadRelations($this->items);
         }

Schema/Blueprint.php

@@ -966,6 +966,17 @@ public function softDeletesTz($precision = 0)
         return $this->timestampTz('deleted_at', $precision)->nullable();
     }
 
+    /**
+     * Create a new year column on the table.
+     *
+     * @param  string  $column
+     * @return \Illuminate\Support\Fluent
+     */
+    public function year($column)
+    {
+        return $this->addColumn('year', $column);
+    }
+
     /**
      * Create a new binary column on the table.
      *

Schema/Grammars/MySqlGrammar.php

@@ -653,6 +653,17 @@ protected function typeTimestampTz(Fluent $column)
         return $this->typeTimestamp($column);
     }
 
+    /**
+     * Create the column definition for a year type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeYear(Fluent $column)
+    {
+        return 'year';
+    }
+
     /**
      * Create the column definition for a binary type.
      *

Schema/Grammars/PostgresGrammar.php

@@ -629,6 +629,17 @@ protected function typeTimestampTz(Fluent $column)
         return $column->useCurrent ? "$columnType default CURRENT_TIMESTAMP" : $columnType;
     }
 
+    /**
+     * Create the column definition for a year type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeYear(Fluent $column)
+    {
+        return $this->typeInteger($column);
+    }
+
     /**
      * Create the column definition for a binary type.
      *

Schema/Grammars/SQLiteGrammar.php

@@ -618,6 +618,17 @@ protected function typeTimestampTz(Fluent $column)
         return $this->typeTimestamp($column);
     }
 
+    /**
+     * Create the column definition for a year type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeYear(Fluent $column)
+    {
+        return $this->typeInteger($column);
+    }
+
     /**
      * Create the column definition for a binary type.
      *

Schema/Grammars/SqlServerGrammar.php

@@ -575,6 +575,17 @@ protected function typeTimestampTz(Fluent $column)
         return "datetimeoffset($column->precision)";
     }
 
+    /**
+     * Create the column definition for a year type.
+     *
+     * @param  \Illuminate\Support\Fluent  $column
+     * @return string
+     */
+    protected function typeYear(Fluent $column)
+    {
+        return $this->typeInteger($column);
+    }
+
     /**
      * Create the column definition for a binary type.
      *