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

Merge pull request #583 from sminnee/version-latest-fix

Browse Source 
BUGFIX: Allow Versioned::get_latest_version() and Version::get_version()to return results if the classname has changed.
This commit is contained in:
Sean Harvey 2012-06-27 18:03:45 -07:00
commit fc98c682f8
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/Versioned.php
View File

@ -991,7 +991,7 @@ class Versioned extends DataExtension {
*/ */
static function get_latest_version($class, $id) { static function get_latest_version($class, $id) {
$baseClass = ClassInfo::baseDataClass($class); $baseClass = ClassInfo::baseDataClass($class);
$list = DataList::create($class)->where("\"$baseClass\".\"RecordID\" = $id"); $list = DataList::create($baseClass)->where("\"$baseClass\".\"RecordID\" = $id");
$list->dataQuery()->setQueryParam("Versioned.mode", "latest_versions"); $list->dataQuery()->setQueryParam("Versioned.mode", "latest_versions");
return $list->First(); return $list->First();
} }
@ -1033,7 +1033,7 @@ class Versioned extends DataExtension {
*/ */
static function get_version($class, $id, $version) { static function get_version($class, $id, $version) {
$baseClass = ClassInfo::baseDataClass($class); $baseClass = ClassInfo::baseDataClass($class);
$list = DataList::create($class)->where("\"$baseClass\".\"RecordID\" = $id")->where("\"$baseClass\".\"Version\" = " . (int)$version); $list = DataList::create($baseClass)->where("\"$baseClass\".\"RecordID\" = $id")->where("\"$baseClass\".\"Version\" = " . (int)$version);
$list->dataQuery()->setQueryParam('Versioned.mode', 'all_versions'); $list->dataQuery()->setQueryParam('Versioned.mode', 'all_versions');
return $list->First(); return $list->First();
} }

24
tests/model/VersionedTest.php
View File

@ -242,6 +242,30 @@ class VersionedTest extends SapphireTest {
'VersionedTest_Subclass_Live', 'VersionedTest_Subclass_Live',
), DataObject::get('VersionedTest_Subclass')->dataQuery()->query()->queriedTables()); ), DataObject::get('VersionedTest_Subclass')->dataQuery()->query()->queriedTables());
} }
public function testGetVersionWhenClassnameChanged() {
$obj = new VersionedTest_DataObject;
$obj->Name = "test";
$obj->write();
$obj->Name = "test2";
$obj->ClassName = "VersionedTest_Subclass";
$obj->write();
$subclassVersion = $obj->Version;
$obj->Name = "test3";
$obj->ClassName = "VersionedTest_DataObject";
$obj->write();
// We should be able to pass the subclass and still get the correct class back
$obj2 = Versioned::get_version("VersionedTest_Subclass", $obj->ID, $subclassVersion);
$this->assertInstanceOf("VersionedTest_Subclass", $obj2);
$this->assertEquals("test2", $obj2->Name);
$obj3 = Versioned::get_latest_version("VersionedTest_Subclass", $obj->ID);
$this->assertEquals("test3", $obj3->Name);
$this->assertInstanceOf("VersionedTest_DataObject", $obj3);
}
} }
class VersionedTest_DataObject extends DataObject implements TestOnly { class VersionedTest_DataObject extends DataObject implements TestOnly {