wip

Author: cosmastech

src/Illuminate/Database/Eloquent/Builder.php

@@ -60,6 +60,13 @@ class Builder implements BuilderContract
      */
     public $pendingAttributes = [];
 
+    /**
+     * Indicates if attributes, timestamps, and unique IDs should be merged before insert.
+     *
+     * @var bool
+     */
+    public $mergeAttributesBeforeInsert = false;
+
     /**
      * The relationships that should be eager loaded.
      *
@@ -136,6 +143,19 @@ class Builder implements BuilderContract
         'torawsql',
     ];
 
+    /**
+     * The pass-thru methods that can have attributes merged before insert.
+     *
+     * @var string[]
+     */
+    protected $mergeBeforeInsertPassThru = [
+        'insert',
+        'insertgetid',
+        'insertorignore',
+        'insertusing',
+        'insertorignoreusing',
+    ];
+
     /**
      * Applied global scopes.
      *
@@ -588,17 +608,47 @@ public function findOr($id, $columns = ['*'], ?Closure $callback = null)
         return $callback();
     }
 
+    /*
+     * 'insert',
+        'insertgetid',
+        'insertorignore',
+        'insertusing',
+        'insertorignoreusing',
+     */
+    public function insert(array $values)
+    {
+        if ($this->mergeAttributesBeforeInsert) {
+            $values = $this->castBeforeInsert($values);
+        }
+
+        return $this->forwardCallTo($this->query, 'insert', [$values]);
+    }
+
+    /**
+     * @param  array  $values
+     * @param $sequence
+     * @return int|mixed
+     */
+    public function insertGetId(array $values, $sequence = null)
+    {
+        if ($this->mergeAttributesBeforeInsert) {
+            $values = $this->castBeforeInsert([$values])[0];
+        }
+
+        return $this->forwardCallTo($this->query, 'insertGetId', [$values, $sequence]);
+    }
+
     /**
      * Insert a number of records, merging in default attributes,
      * adding timestamps, and converting casts to raw values.
      *
      * @param  list<array<string, mixed>>  $values
-     * @return bool
+     * @return array
      */
-    public function insertWithCasts($values)
+    public function castBeforeInsert($values)
     {
         if (empty($values)) {
-            return true;
+            [];
         }
 
         if (! is_array(reset($values))) {
@@ -629,7 +679,7 @@ public function insertWithCasts($values)
             }
         });
 
-        return $this->toBase()->insert($values);
+        return $values;
     }
 
     /**
@@ -1880,6 +1930,20 @@ public function withAttributes(Expression|array|string $attributes, $value = nul
         return $this;
     }
 
+    /**
+     * Indicate if insert methods should merge in default attributes,
+     * add timestamps, and converting casts to raw values.
+     *
+     * @param  bool  $merge
+     * @return $this|Builder
+     */
+    public function mergeAttributesBeforeInsert($merge = true)
+    {
+        $this->mergeAttributesBeforeInsert = $merge;
+
+        return $this;
+    }
+
     /**
      * Apply query-time casts to the model instance.
      *
@@ -2180,7 +2244,10 @@ public function __call($method, $parameters)
             return $this->callNamedScope($method, $parameters);
         }
 
-        if (in_array(strtolower($method), $this->passthru)) {
+        if (in_array($lowerCaseMethod = strtolower($method), $this->passthru)) {
+            if ($this->mergeAttributesBeforeInsert && in_array($lowerCaseMethod, $this->mergeBeforeInsertPassThru)) {
+                $parameters[0] = $this->castBeforeInsert($parameters[0])[0];
+            }
             return $this->toBase()->{$method}(...$parameters);
         }
 

tests/Database/DatabaseEloquentIntegrationTest.php

@@ -83,7 +83,7 @@ protected function createSchema()
             $table->timestamps();
         });
 
-        $this->schema()->create('users_with_uuid', function (Blueprint $table) {
+        $this->schema()->create('users_having_uuids', function (Blueprint $table) {
             $table->id();
             $table->uuid();
             $table->string('name');
@@ -2477,7 +2477,7 @@ public function testCanInsertWithCasts()
         DB::enableQueryLog();
         Carbon::setTestNow('2025-03-15T07:32:00Z');
 
-        $this->assertTrue(EloquentTestUser::insertWithCasts([
+        $this->assertTrue(EloquentTestUser::mergeAttributesBeforeInsert()->insert([
             ['email' => '[email protected]', 'birthday' => null],
             ['email' => '[email protected]', 'birthday' => new Carbon('1980-01-01')],
             ['email' => '[email protected]', 'birthday' => '1987-11-01', 'created_at' => '2025-01-02T02:00:55', 'updated_at' => Carbon::parse('2025-02-19T11:41:13')],
@@ -2503,7 +2503,7 @@ public function testCanInsertWithCasts()
 
         DB::flushQueryLog();
 
-        $this->assertTrue(EloquentTestWithJSON::insertWithCasts([
+        $this->assertTrue(EloquentTestWithJSON::mergeAttributesBeforeInsert()->insert([
             ['id' => 1, 'json' => ['album' => 'Keep It Like a Secret', 'release_date' => '1999-02-02']],
             ['id' => 2, 'json' => (object) ['album' => 'You In Reverse', 'release_date' => '2006-04-11']],
         ]));
@@ -2526,7 +2526,7 @@ public function testCanInsertWithCastsWithUniqueStringIds()
             '22222222-0000-7000-0000-000000000000',
         ]);
 
-        $this->assertTrue(ModelWithUniqueStringIds::insertWithCasts([
+        $this->assertTrue(ModelWithUniqueStringIds::mergeAttributesBeforeInsert()->insert([
             [
                 'name' => 'Taylor', 'role' => IntBackedRole::Admin, 'role_string' => StringBackedRole::Admin,
             ],
@@ -2565,6 +2565,26 @@ public function testCanInsertWithCastsWithUniqueStringIds()
         $this->assertSame('22222222-0000-7000-0000-000000000000', $chris->uuid);
     }
 
+    public function testMergeBeforeInsertGetId()
+    {
+        Str::createUuidsUsingSequence([
+            '00000000-0000-7000-0000-000000000000',
+        ]);
+
+        DB::enableQueryLog();
+        try {
+            $this->assertSame(1, ModelWithUniqueStringIds::mergeAttributesBeforeInsert()->insertGetId([
+                'name' => 'Taylor',
+                'role' => IntBackedRole::Admin,
+                'role_string' => StringBackedRole::Admin,
+            ]));
+        } catch (\Throwable $t) {
+            dd($t);
+            echo "error";
+        }
+        //dd(DB::getRawQueryLog());
+    }
+
     /**
      * Helpers...
      */
@@ -2897,7 +2917,7 @@ class ModelWithUniqueStringIds extends Eloquent
 
     public $timestamps = false;
 
-    protected $table = 'users_with_uuid';
+    protected $table = 'users_having_uuids';
 
     protected function casts()
     {