From 5e15362a32b05967144976f822d5693cc69cd1ae Mon Sep 17 00:00:00 2001 From: Geoff Munn Date: Thu, 17 Sep 2009 00:04:09 +0000 Subject: [PATCH] MINOR FIX: columns quoted properly + database agnostic version of RANDOM() created git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86505 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/DataObjectTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/DataObjectTest.php b/tests/DataObjectTest.php index 82cec5c42..367a0a136 100644 --- a/tests/DataObjectTest.php +++ b/tests/DataObjectTest.php @@ -317,10 +317,10 @@ class DataObjectTest extends SapphireTest { $this->assertEquals($keysA, $keysB); /* If we perform the same random query twice, it shouldn't return the same results */ - $itemsA = DataObject::get("PageComment", "", "RAND()"); + $itemsA = DataObject::get("PageComment", "", DB::getConn()->random()); foreach($itemsA as $item) $keysA[] = $item->ID; - $itemsB = DataObject::get("PageComment", "", "RAND()"); + $itemsB = DataObject::get("PageComment", "", DB::getConn()->random()); foreach($itemsB as $item) $keysB[] = $item->ID; $this->assertNotEquals($keysA, $keysB); @@ -752,7 +752,7 @@ class DataObjectTest extends SapphireTest { $obj2->write(); // Check that the values of those fields are properly read from the database - $values = DataObject::get("DataObjectTest_Team", "DataObjectTest_Team.ID IN + $values = DataObject::get("DataObjectTest_Team", "\"DataObjectTest_Team\".\"ID\" IN ($obj1->ID, $obj2->ID)")->column("SubclassDatabaseField"); $this->assertEquals(array('obj1', 'obj2'), $values); }