tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

API Filtering on invalid relation is no longer a silent error

Browse Source 
Fixes #5331
This commit is contained in:
Damian Mooyman 2016-05-02 16:41:30 +12:00
parent ca1716b9f3
commit 0d4c71f393
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/DataList.php
View File

@ -503,7 +503,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
$fieldName = array_pop($relations);
// Apply
$relationModelName = $query->applyRelation($field, $linearOnly);
$relationModelName = $query->applyRelation($relations, $linearOnly);
// Find the db field the relation belongs to
$className = ClassInfo::table_for_object_field($relationModelName, $fieldName);

14
model/DataQuery.php
View File

@ -641,16 +641,20 @@ class DataQuery {
* mappings to the query object state. This has to be called
* in any overloaded {@link SearchFilter->apply()} methods manually.
*
* @param String|array $relation The array/dot-syntax relation to follow
* @param string|array $relation The array/dot-syntax relation to follow
* @param bool $linearOnly Set to true to restrict to linear relations only. Set this
* if this relation will be used for sorting, and should not include duplicate rows.
* @return The model class of the related item
* @return string The model class of the related item
*/
public function applyRelation($relation, $linearOnly = false) {
// NO-OP
if(!$relation) return $this->dataClass;
if(!$relation) {
return $this->dataClass;
}
if(is_string($relation)) $relation = explode(".", $relation);
if(is_string($relation)) {
$relation = explode(".", $relation);
}
$modelClass = $this->dataClass;
@ -682,6 +686,8 @@ class DataQuery {
);
$modelClass = $componentClass;
} else {
throw new InvalidArgumentException("$rel is not a relation on model $modelClass");
}
}

11
tests/model/DataListTest.php
View File

@ -833,6 +833,17 @@ class DataListTest extends SapphireTest {
$this->assertEquals('007', $list->first()->ShirtNumber);
}
public function testFilterOnInvalidRelation() {
$this->setExpectedException(
'InvalidArgumentException',
"MascotAnimal is not a relation on model DataObjectTest_Team"
);
// Filter on missing relation 'MascotAnimal'
DataObjectTest_Team::get()
->filter('MascotAnimal.Name', 'Richard')
->toArray();
}
public function testFilterAndExcludeById() {
$id = $this->idFromFixture('DataObjectTest_SubTeam', 'subteam1');
$list = DataObjectTest_SubTeam::get()->filter('ID', $id);