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

Jump to bottom

[6.x] Use Model connection if set on Model when validating with exists:Model #31037

Merged
merged 2 commits into from
Jan 6, 2020
Merged

[6.x] Use Model connection if set on Model when validating with exists:Model #31037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8158354
Use Model connection if set on Model when validating with exists:Model
Jan 6, 2020
69542b9
create model instance to avoid multiple instances of model
alexkb Jan 6, 2020
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
1 change: 1 addition & 0 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ public function parseTable($table)
[$connection, $table] = Str::contains($table, '.') ? explode('.', $table, 2) : [null, $table];

if (Str::contains($table, '\\') && class_exists($table) && is_a($table, Model::class, true)) {
$connection = $connection ?? (new $table)->getConnectionName();
$table = (new $table)->getTable();
}
alexkb marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
12 changes: 12 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4323,6 +4323,10 @@ public function testParsingTablesFromModels()
$this->assertEquals('connection', $explicit_connection[0]);
$this->assertEquals('explicits', $explicit_connection[1]);

$explicit_model_implicit_connection = $v->parseTable(ExplicitTableAndConnectionModel::class);
$this->assertEquals('connection', $explicit_model_implicit_connection[0]);
$this->assertEquals('explicits', $explicit_model_implicit_connection[1]);

$noneloquent_connection = $v->parseTable('connection.'.NonEloquentModel::class);
$this->assertEquals('connection', $noneloquent_connection[0]);
$this->assertEquals(NonEloquentModel::class, $noneloquent_connection[1]);
Expand Down Expand Up @@ -5198,6 +5202,14 @@ class ExplicitTableModel extends Model
public $timestamps = false;
}

class ExplicitTableAndConnectionModel extends Model
{
protected $table = 'explicits';
protected $connection = 'connection';
protected $guarded = [];
public $timestamps = false;
}

class NonEloquentModel
{
}