From 53b5adbcd98ff4d0e3947f4472b7b7b62a2b064a Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 4 Mar 2014 11:46:53 +1300 Subject: [PATCH] BUG Prevent unnecessary reconstruction of ClassName field after default records are generated --- model/DataObject.php | 2 +- .../model/DataObjectSchemaGenerationTest.php | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/model/DataObject.php b/model/DataObject.php index 0fd1281c0..067a209c2 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -237,7 +237,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity $db = DB::getConn(); if($db->hasField($class, 'ClassName')) { $existing = $db->query("SELECT DISTINCT \"ClassName\" FROM \"$class\"")->column(); - $classNames = array_unique(array_merge($existing, $classNames)); + $classNames = array_unique(array_merge($classNames, $existing)); } self::$classname_spec_cache[$class] = "Enum('" . implode(', ', $classNames) . "')"; diff --git a/tests/model/DataObjectSchemaGenerationTest.php b/tests/model/DataObjectSchemaGenerationTest.php index 6c2d86c76..c33cb7e36 100644 --- a/tests/model/DataObjectSchemaGenerationTest.php +++ b/tests/model/DataObjectSchemaGenerationTest.php @@ -124,6 +124,57 @@ class DataObjectSchemaGenerationTest extends SapphireTest { // Restore old indexes Config::unnest(); } + + /** + * Tests the generation of the ClassName spec and ensure it's not unnecessarily influenced + * by the order of classnames of existing records + */ + public function testClassNameSpecGeneration() { + + // Test with blank entries + DataObject::clear_classname_spec_cache(); + $fields = DataObject::database_fields('DataObjectSchemaGenerationTest_DO'); + $this->assertEquals( + "Enum('DataObjectSchemaGenerationTest_DO, DataObjectSchemaGenerationTest_IndexDO')", + $fields['ClassName'] + ); + + // Test with instance of subclass + $item1 = new DataObjectSchemaGenerationTest_IndexDO(); + $item1->write(); + DataObject::clear_classname_spec_cache(); + $fields = DataObject::database_fields('DataObjectSchemaGenerationTest_DO'); + $this->assertEquals( + "Enum('DataObjectSchemaGenerationTest_DO, DataObjectSchemaGenerationTest_IndexDO')", + $fields['ClassName'] + ); + $item1->delete(); + + // Test with instance of main class + $item2 = new DataObjectSchemaGenerationTest_DO(); + $item2->write(); + DataObject::clear_classname_spec_cache(); + $fields = DataObject::database_fields('DataObjectSchemaGenerationTest_DO'); + $this->assertEquals( + "Enum('DataObjectSchemaGenerationTest_DO, DataObjectSchemaGenerationTest_IndexDO')", + $fields['ClassName'] + ); + $item2->delete(); + + // Test with instances of both classes + $item1 = new DataObjectSchemaGenerationTest_IndexDO(); + $item1->write(); + $item2 = new DataObjectSchemaGenerationTest_DO(); + $item2->write(); + DataObject::clear_classname_spec_cache(); + $fields = DataObject::database_fields('DataObjectSchemaGenerationTest_DO'); + $this->assertEquals( + "Enum('DataObjectSchemaGenerationTest_DO, DataObjectSchemaGenerationTest_IndexDO')", + $fields['ClassName'] + ); + $item1->delete(); + $item2->delete(); + } } class DataObjectSchemaGenerationTest_DO extends DataObject implements TestOnly {