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

Merge branch '4.13' into 4

This commit is contained in:
github-actions 2023-09-16 14:23:42 +00:00
parent e28457cfa7 58696e3ed5
commit 5f72f9c9de
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ORM/DataQuery.php
View File

@ -603,6 +603,7 @@ class DataQuery
$schema = DataObject::getSchema(); $schema = DataObject::getSchema();
$databaseFields = $schema->databaseFields($tableClass, false); $databaseFields = $schema->databaseFields($tableClass, false);
$compositeFields = $schema->compositeFields($tableClass, false); $compositeFields = $schema->compositeFields($tableClass, false);
$tableName = $schema->tableName($tableClass);
unset($databaseFields['ID']); unset($databaseFields['ID']);
foreach ($databaseFields as $k => $v) { foreach ($databaseFields as $k => $v) {
if ((is_null($columns) || in_array($k, $columns ?? [])) && !isset($compositeFields[$k])) { if ((is_null($columns) || in_array($k, $columns ?? [])) && !isset($compositeFields[$k])) {
@ -618,12 +619,12 @@ class DataQuery
$query->selectField($quotedField, $k); $query->selectField($quotedField, $k);
} }
$dbO = Injector::inst()->create($v, $k); $dbO = Injector::inst()->create($v, $k);
$dbO->setTable($tableName);
$dbO->addToQuery($query); $dbO->addToQuery($query);
} }
} }
foreach ($compositeFields as $k => $v) { foreach ($compositeFields as $k => $v) {
if ((is_null($columns) || in_array($k, $columns ?? [])) && $v) { if ((is_null($columns) || in_array($k, $columns ?? [])) && $v) {
$tableName = $schema->tableName($tableClass);
$dbO = Injector::inst()->create($v, $k); $dbO = Injector::inst()->create($v, $k);
$dbO->setTable($tableName); $dbO->setTable($tableName);
$dbO->addToQuery($query); $dbO->addToQuery($query);

2
src/ORM/FieldType/DBClassName.php
View File

@ -151,6 +151,8 @@ class DBClassName extends DBEnum
if ($record instanceof DataObject) { if ($record instanceof DataObject) {
$this->record = $record; $this->record = $record;
} }
return $this;
} }
public function getDefault() public function getDefault()

2
src/ORM/FieldType/DBPrimaryKey.php
View File

@ -68,5 +68,7 @@ class DBPrimaryKey extends DBInt
if ($record instanceof DataObject) { if ($record instanceof DataObject) {
$this->object = $record; $this->object = $record;
} }
return $this;
} }
} }

5
tests/php/ORM/DataQueryTest.php
View File

@ -387,8 +387,9 @@ class DataQueryTest extends SapphireTest
// Including filter on parent table only doesn't pull in second // Including filter on parent table only doesn't pull in second
$query = new DataQuery(DataQueryTest\DataObjectAddsToQuery::class); $query = new DataQuery(DataQueryTest\DataObjectAddsToQuery::class);
$result = $query->getFinalisedQuery(); $result = $query->getFinalisedQuery();
// The `DBFieldAddsToQuery` test field removes itself from the select query // The `DBFieldAddsToQuery` test field adds a new field to the select query
$this->assertArrayNotHasKey('FieldTwo', $result->getSelect()); $this->assertArrayHasKey('FieldTwo2', $result->getSelect());
$this->assertSame('"DataQueryTest_AddsToQuery"."FieldTwo"', $result->getSelect()['FieldTwo2']);
} }
/** /**

7
tests/php/ORM/DataQueryTest/DBFieldAddsToQuery.php
View File

@ -4,13 +4,14 @@ namespace SilverStripe\ORM\Tests\DataQueryTest;
use SilverStripe\Dev\TestOnly; use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\FieldType\DBText; use SilverStripe\ORM\FieldType\DBText;
use SilverStripe\ORM\Queries\SQLSelect;
class DBFieldAddsToQuery extends DBText implements TestOnly class DBFieldAddsToQuery extends DBText implements TestOnly
{ {
public function addToQuery(&$query) public function addToQuery(&$query)
{ {
$select = $query->getSelect(); // Add a new item, to validate that tableName and name are set correctly.
unset($select[$this->name]); /** @var SQLSelect $query */
$query->setSelect($select); $query->addSelect([$this->name . '2' => '"' . $this->tableName . '"."' . $this->name . '"']);
} }
} }