tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX: Fixed PGSQL test suite

This commit is contained in:
Sam Minnee 2014-02-18 18:46:17 +13:00
parent 26aae5e824
commit 53c23f9e43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/extensions/SiteTreeSubsites.php
View File

@ -184,9 +184,9 @@ class SiteTreeSubsites extends DataExtension {
*/
function ReverseRelated() {
return DataObject::get('RelatedPageLink', "\"RelatedPageLink\".\"RelatedPageID\" = {$this->owner->ID}
AND R2.\"ID\" IS NULL", '')
AND \"R2\".\"ID\" IS NULL", '')
->innerJoin('SiteTree', "\"SiteTree\".\"ID\" = \"RelatedPageLink\".\"MasterPageID\"")
->leftJoin('RelatedPageLink', "R2.\"MasterPageID\" = {$this->owner->ID} AND R2.\"RelatedPageID\" = \"RelatedPageLink\".\"MasterPageID\"", 'R2');
->leftJoin('RelatedPageLink', "\"R2\".\"MasterPageID\" = {$this->owner->ID} AND \"R2\".\"RelatedPageID\" = \"RelatedPageLink\".\"MasterPageID\"", 'R2');
}
function NormalRelated() {

2
tests/FileSubsitesTest.php
View File

@ -67,7 +67,7 @@ class FileSubsitesTest extends BaseSubsiteTest {
'Test 1',
'Test 2',
'Test 3'
), $file->getCMSFields()->dataFieldByName('SubsiteID')->getSource());
), array_values($file->getCMSFields()->dataFieldByName('SubsiteID')->getSource()));
}
}