Skip to content
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.

Sign up for GitHub

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

Revert "Fix: Handle mixed-type values in compileInsert" #54169

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Revert "Fix: Handle mixed-type values in compileInsert" #54169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions src/Illuminate/Database/Query/Grammars/Grammar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,11 +1178,8 @@ public function compileInsert(Builder $query, array $values)
return "insert into {$table} default values";
}

if (! array_is_list($values)) {
$values = (new Collection(array_keys($values)))
->some(fn ($key) => ! is_numeric($key))
? [$values]
: array_values($values);
if (! is_array(reset($values))) {
$values = [$values];
}

$columns = $this->columnize(array_keys(reset($values)));
Expand Down
77 changes: 0 additions & 77 deletions tests/Database/DatabaseQueryGrammarTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

namespace Illuminate\Tests\Database;

use Illuminate\Database\ConnectionInterface;
use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\Expression;
use Illuminate\Database\Query\Grammars\Grammar;
use Illuminate\Database\Query\Processors\Processor;
use Mockery as m;
use PHPUnit\Framework\TestCase;
use ReflectionClass;
Expand Down Expand Up @@ -43,79 +41,4 @@ public function testWhereRawReturnsStringWhenStringPassed()

$this->assertSame('select * from "users"', $rawQuery);
}

public function testCompileInsertSingleValue()
{
$builder = $this->getBuilder();
$grammar = $builder->getGrammar();

$sql = $grammar->compileInsert($builder, ['name' => 'John Doe', 'email' => 'johndoe@laravel.com']);
$this->assertSame('insert into "users" ("name", "email") values (?, ?)', $sql);
}

public function testCompileInsertMultipleValues()
{
$builder = $this->getBuilder();
$grammar = $builder->getGrammar();
$values = [
['name' => 'John Doe', 'email' => 'john@doe.com'],
['name' => 'Alice Wong', 'email' => 'alice@wong.com'],
];

$sql = $grammar->compileInsert($builder, $values);
$this->assertSame('insert into "users" ("name", "email") values (?, ?), (?, ?)', $sql);
}

public function testCompileInsertSingleValueWhereFirstKeyIsArray()
{
$builder = $this->getBuilder();
$grammar = $builder->getGrammar();
$value = [
'configuration' => [
'dark_mode' => false,
'language' => 'en',
],
'name' => 'John Doe',
'email' => 'john@doe.com',
];

$sql = $grammar->compileInsert($builder, $value);

$this->assertSame('insert into "users" ("configuration", "name", "email") values (?, ?, ?)', $sql);
}

public function testCompileInsertSingleValueWhereFirstKeyIsNotArray()
{
$builder = $this->getBuilder();
$grammar = $builder->getGrammar();

$value = [
'name' => 'John Doe',
'configuration' => [
'dark_mode' => false,
'language' => 'en',
],
'email' => 'john@doe.com',
];

$sql = $grammar->compileInsert($builder, $value);

$this->assertSame('insert into "users" ("name", "configuration", "email") values (?, ?, ?)', $sql);
}

protected function getConnection()
{
return m::mock(ConnectionInterface::class);
}

protected function getBuilder($tableName = 'users')
{
$grammar = new Grammar;
$processor = m::mock(Processor::class);

$builder = new Builder($this->getConnection(), $grammar, $processor);
$builder->from = $tableName;

return $builder;
}
}
Loading