Skip to content

Commit b32bb61

Browse files
GianlucaGianluca
authored andcommitted
fixes Builder, test
1 parent 34b689c commit b32bb61

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

src/Illuminate/Database/Eloquent/Builder.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,17 @@ public function qualifyColumn($column)
15171517
return $this->model->qualifyColumn($column);
15181518
}
15191519

1520+
/**
1521+
* Qualify the column's lists name by the model's table.
1522+
*
1523+
* @param array|mixed $columns
1524+
* @return array
1525+
*/
1526+
public function qualifyColumns($columns)
1527+
{
1528+
return $this->model->qualifyColumns($columns);
1529+
}
1530+
15201531
/**
15211532
* Get the given macro by name.
15221533
*

src/Illuminate/Database/Eloquent/Model.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,9 @@ public function qualifyColumn($column)
440440
* @param array|mixed $columns
441441
* @return array
442442
*/
443-
public function qualifyColumns(...$columns)
443+
public function qualifyColumns($columns)
444444
{
445+
$columns = is_array($columns) ? $columns : func_get_args();
445446
$qualifiedArray = [];
446447
foreach($columns as $column) {
447448
$qualifiedArray[] = $this->qualifyColumn($column);

tests/Database/DatabaseEloquentBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public function testQualifyColumns()
204204
$builder->setModel(new EloquentModelStub);
205205

206206
$this->assertSame(['stub.column', 'stub.column2', 'stub.column3'], $builder->qualifyColumns('column', 'column2', 'column3'));
207-
$this->assertSame(['stub.column', 'stub.column2', 'stub.column3'], $builder->qualifyColumns(...['column', 'column2', 'column3']));
207+
$this->assertSame(['stub.column', 'stub.column2', 'stub.column3'], $builder->qualifyColumns(['column', 'column2', 'column3']));
208208
}
209209

210210
public function testGetMethodLoadsModelsAndHydratesEagerRelations()

0 commit comments

Comments
 (0)