Skip to content

Merge 5.4 into 5.x #3432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Query/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,10 @@ public function insert(array $values)
$values = [$values];
}

$values = $this->aliasIdForQuery($values);
$values = array_map(
$this->aliasIdForQuery(...),
$values,
);

$options = $this->inheritConnectionOptions();

Expand Down
22 changes: 22 additions & 0 deletions tests/ModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use MongoDB\Laravel\Tests\Models\IdIsString;
use MongoDB\Laravel\Tests\Models\Item;
use MongoDB\Laravel\Tests\Models\MemberStatus;
use MongoDB\Laravel\Tests\Models\NonIncrementing;
use MongoDB\Laravel\Tests\Models\Soft;
use MongoDB\Laravel\Tests\Models\SqlUser;
use MongoDB\Laravel\Tests\Models\User;
Expand Down Expand Up @@ -56,6 +57,7 @@ public function tearDown(): void
Book::truncate();
Item::truncate();
Guarded::truncate();
NonIncrementing::truncate();

parent::tearDown();
}
Expand Down Expand Up @@ -106,6 +108,26 @@ public function testInsert(): void
$this->assertEquals(35, $user->age);
}

public function testInsertNonIncrementable(): void
{
$connection = DB::connection('mongodb');
$connection->setRenameEmbeddedIdField(false);

$nonIncrementing = new NonIncrementing();
$nonIncrementing->id = '12345';
$nonIncrementing->name = 'John Doe';

$nonIncrementing->save();

$this->assertTrue($nonIncrementing->exists);
$this->assertEquals(1, NonIncrementing::count());

$check = NonIncrementing::find($nonIncrementing->id);
$this->assertInstanceOf(NonIncrementing::class, $check);
$this->assertSame('12345', $check->id);
$this->assertEquals('John Doe', $check->name);
}

public function testUpdate(): void
{
$user = new User();
Expand Down
26 changes: 26 additions & 0 deletions tests/Models/NonIncrementing.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

namespace MongoDB\Laravel\Tests\Models;

use Illuminate\Database\Eloquent\Model;
use MongoDB\Laravel\Eloquent\DocumentModel;

/**
* @property string $id
* @property string $name
*/
class NonIncrementing extends Model
{
use DocumentModel;

protected $keyType = 'string';
protected $connection = 'mongodb';

protected $fillable = [
'name',
];
protected static $unguarded = true;
public $incrementing = false;
}
16 changes: 16 additions & 0 deletions tests/QueryBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,22 @@ public function testInsert()
$this->assertIsArray($user->tags);
}

#[TestWith([true])]
#[TestWith([false])]
public function testInsertWithCustomId(bool $renameEmbeddedIdField)
{
$connection = DB::connection('mongodb');
$connection->setRenameEmbeddedIdField($renameEmbeddedIdField);

$data = ['id' => 'abcdef', 'name' => 'John Doe'];

DB::table('users')->insert($data);

$user = User::find('abcdef');
$this->assertInstanceOf(User::class, $user);
$this->assertSame('abcdef', $user->id);
}

public function testInsertGetId()
{
$id = DB::table('users')->insertGetId(['name' => 'John Doe']);
Expand Down
Loading