Skip to content

Commit

Permalink
DBComposite::writeToManipulation() is never called
Browse files Browse the repository at this point in the history
  • Loading branch information
lekoala authored and GuySartorelli committed Aug 10, 2023
1 parent 597d97b commit d621d00
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/ORM/DataObject.php
Expand Up @@ -1491,7 +1491,7 @@ protected function prepareManipulationTable($baseTable, $now, $isNewRecord, &$ma
$specification = $schema->fieldSpec(
$class,
$fieldName,
DataObjectSchema::DB_ONLY | DataObjectSchema::UNINHERITED
DataObjectSchema::UNINHERITED
);
if (!$specification) {
continue;
Expand Down
33 changes: 32 additions & 1 deletion tests/php/ORM/DBCompositeTest.php
Expand Up @@ -53,7 +53,8 @@ public function testCompositeFieldMetaDataFunctions()
$this->assertEquals(
[
'MyMoney' => 'Money',
'OverriddenMoney' => 'Money'
'OverriddenMoney' => 'Money',
'DoubleMoney' => DBCompositeTest\DBDoubleMoney::class
],
$schema->compositeFields(DBCompositeTest\TestObject::class)
);
Expand All @@ -68,6 +69,7 @@ public function testCompositeFieldMetaDataFunctions()
'MyMoney' => 'Money',
'OtherMoney' => 'Money',
'OverriddenMoney' => 'Money',
'DoubleMoney' => DBCompositeTest\DBDoubleMoney::class
],
$schema->compositeFields(DBCompositeTest\SubclassedDBFieldObject::class)
);
Expand Down Expand Up @@ -111,4 +113,33 @@ public function testInheritedTables()
$this->assertEquals('DBCompositeTest_SubclassedDBFieldObject', $object2->dbObject('OtherMoney')->getTable());
$this->assertEquals('DBCompositeTest_SubclassedDBFieldObject', $object2->dbObject('OverriddenMoney')->getTable());
}

public function testSetFieldDynamicPropertyException()
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage(implode(' ', [
'Field abc does not exist.',
'If this was accessed via a dynamic property then call setDynamicData() instead.'
]));
$object = new DBCompositeTest\TestObject();
$object->MyMoney->abc = 'def';
}

public function testWriteToManipuationIsCalledWhenWritingDataObject()
{
$obj = DBCompositeTest\TestObject::create();
$obj->DoubleMoney = ['Amount' => 10, 'Currency' => 'CAD'];
$moneyField = $obj->dbObject('DoubleMoney');
$this->assertEquals(10, $moneyField->getAmount());

$obj->write();

// Custom money class should double the amount before writing
$this->assertEquals(20, $moneyField->getAmount());

// Note: these would fail since dbObject will return a new instance
// of the DoubleMoney field based on the initial values
// $this->assertSame($moneyField, $obj->dbObject('DoubleMoney'));
// $this->assertEquals(20, $obj->dbObject('DoubleMoney')->getAmount());
}
}
17 changes: 17 additions & 0 deletions tests/php/ORM/DBCompositeTest/DBDoubleMoney.php
@@ -0,0 +1,17 @@
<?php

namespace SilverStripe\ORM\Tests\DBCompositeTest;

use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\FieldType\DBMoney;

class DBDoubleMoney extends DBMoney implements TestOnly
{
public function writeToManipulation(&$manipulation)
{
// Duplicate the amount before writing
$this->setAmount($this->getAmount() * 2);

parent::writeToManipulation($manipulation);
}
}
3 changes: 2 additions & 1 deletion tests/php/ORM/DBCompositeTest/TestObject.php
Expand Up @@ -12,6 +12,7 @@ class TestObject extends DataObject implements TestOnly
private static $db = [
'Title' => 'Text',
'MyMoney' => 'Money',
'OverriddenMoney' => 'Money'
'OverriddenMoney' => 'Money',
'DoubleMoney' => DBDoubleMoney::class,
];
}

0 comments on commit d621d00

Please sign in to comment.