tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 21:58:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3467 from halkyon/distinct_orm

Browse Source 
Adding ability to change query distinct on DataList and DataQuery
This commit is contained in:
Stig Lindqvist 2014-09-04 14:08:40 +12:00
commit 9f3506bf02
4 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
model/DataList.php
View File

@ -224,6 +224,17 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
}); });
} }
/**
* Return a new DataList instance with distinct records or not
*
* @param bool $value
*/
public function distinct($value) {
return $this->alterDataQuery(function($query) use ($value){
$query->distinct($value);
});
}
/** /**
* Return a new DataList instance as a copy of this data list with the sort * Return a new DataList instance as a copy of this data list with the sort
* order set. * order set.

11
model/DataQuery.php
View File

@ -549,6 +549,17 @@ class DataQuery {
return $this; return $this;
} }
/**
* Set whether this query should be distinct or not.
*
* @param bool $value
* @return DataQuery
*/
public function distinct($value) {
$this->query->setDistinct($value);
return $this;
}
/** /**
* Add an INNER JOIN clause to this query. * Add an INNER JOIN clause to this query.
* *

11
tests/model/DataListTest.php
View File

@ -122,6 +122,17 @@ class DataListTest extends SapphireTest {
// $this->assertEquals(1, $check->count()); // $this->assertEquals(1, $check->count());
} }
public function testDistinct() {
$list = DataObjectTest_TeamComment::get();
$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query is set as distinct by default');
$list = $list->distinct(false);
$this->assertNotContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query does not contain distinct');
$list = $list->distinct(true);
$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query contains distinct');
}
public function testDataClass() { public function testDataClass() {
$list = DataObjectTest_TeamComment::get(); $list = DataObjectTest_TeamComment::get();
$this->assertEquals('DataObjectTest_TeamComment',$list->dataClass()); $this->assertEquals('DataObjectTest_TeamComment',$list->dataClass());

12
tests/model/DataQueryTest.php
View File

@ -155,6 +155,18 @@ class DataQueryTest extends SapphireTest {
$result = $query->column('Title'); $result = $query->column('Title');
$this->assertEquals(array('First', 'Second', 'Last'), $result); $this->assertEquals(array('First', 'Second', 'Last'), $result);
} }
public function testDistinct() {
$query = new DataQuery('DataQueryTest_E');
$this->assertContains('SELECT DISTINCT', $query->sql(), 'Query is set as distinct by default');
$query = $query->distinct(false);
$this->assertNotContains('SELECT DISTINCT', $query->sql(), 'Query does not contain distinct');
$query = $query->distinct(true);
$this->assertContains('SELECT DISTINCT', $query->sql(), 'Query contains distinct');
}
} }