mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '3.3' into 3.4
This commit is contained in:
commit
4e392a4d43
@ -347,7 +347,7 @@
|
||||
|
||||
//Fall back to nearest visible element if hidden (for select type fields)
|
||||
if(!$(elementID).is(':visible')){
|
||||
elementID = '#' + $(elementID).closest('.field').attr('id');
|
||||
elementID = '#' + $(elementID).closest('.field:visible').attr('id');
|
||||
scrollY = $(elementID).position().top;
|
||||
}
|
||||
|
||||
|
@ -343,7 +343,11 @@ class BulkLoader_Result extends Object {
|
||||
* @return ArrayList
|
||||
*/
|
||||
public function Deleted() {
|
||||
return $this->mapToArrayList($this->deleted);
|
||||
$set = new ArrayList();
|
||||
foreach ($this->deleted as $arrItem) {
|
||||
$set->push(ArrayData::create($arrItem));
|
||||
}
|
||||
return $set;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -386,11 +390,9 @@ class BulkLoader_Result extends Object {
|
||||
* @param $message string
|
||||
*/
|
||||
public function addDeleted($obj, $message = null) {
|
||||
$this->deleted[] = $this->lastChange = array(
|
||||
'ID' => $obj->ID,
|
||||
'ClassName' => $obj->class,
|
||||
'Message' => $message
|
||||
);
|
||||
$data = $obj->toMap();
|
||||
$data['_BulkLoaderMessage'] = $message;
|
||||
$this->deleted[] = $this->lastChange = $data;
|
||||
$this->lastChange['ChangeType'] = 'deleted';
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,7 @@ and `MyDate`. The attribute `HiddenProperty` should not be searchable, and `MyDa
|
||||
'MyDate' => 'Date'
|
||||
);
|
||||
|
||||
public function getCustomSearchContext() {
|
||||
public function getDefaultSearchContext() {
|
||||
$fields = $this->scaffoldSearchFields(array(
|
||||
'restrictFields' => array('PublicProperty','MyDate')
|
||||
));
|
||||
|
@ -170,7 +170,9 @@ class DataQuery {
|
||||
* @return SQLQuery The finalised sql query
|
||||
*/
|
||||
public function getFinalisedQuery($queriedColumns = null) {
|
||||
if(!$queriedColumns) $queriedColumns = $this->queriedColumns;
|
||||
if(!$queriedColumns) {
|
||||
$queriedColumns = $this->queriedColumns;
|
||||
}
|
||||
if($queriedColumns) {
|
||||
$queriedColumns = array_merge($queriedColumns, array('Created', 'LastEdited', 'ClassName'));
|
||||
}
|
||||
@ -185,11 +187,19 @@ class DataQuery {
|
||||
// Specifying certain columns allows joining of child tables
|
||||
$tableClasses = ClassInfo::dataClassesFor($this->dataClass);
|
||||
|
||||
// Ensure that any filtered columns are included in the selected columns
|
||||
foreach ($query->getWhereParameterised($parameters) as $where) {
|
||||
// Check for just the column, in the form '"Column" = ?' and the form '"Table"."Column"' = ?
|
||||
if (preg_match('/^"([^"]+)"/', $where, $matches) ||
|
||||
preg_match('/^"([^"]+)"\."[^"]+"/', $where, $matches)) {
|
||||
if (!in_array($matches[1], $queriedColumns)) $queriedColumns[] = $matches[1];
|
||||
// Check for any columns in the form '"Column" = ?' or '"Table"."Column"' = ?
|
||||
if(preg_match_all(
|
||||
'/(?:"(?<table>[^"]+)"\.)?"(?<column>[^"]+)"(?:[^\.]|$)/',
|
||||
$where, $matches, PREG_SET_ORDER
|
||||
)) {
|
||||
foreach($matches as $match) {
|
||||
$column = $match['column'];
|
||||
if (!in_array($column, $queriedColumns)) {
|
||||
$queriedColumns[] = $column;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
94
tests/dev/BulkLoaderResultTest.php
Normal file
94
tests/dev/BulkLoaderResultTest.php
Normal file
@ -0,0 +1,94 @@
|
||||
<?php
|
||||
/**
|
||||
* @package framework
|
||||
* @subpackage tests
|
||||
*/
|
||||
class BulkLoaderResultTest extends SapphireTest
|
||||
{
|
||||
protected $extraDataObjects = array('BulkLoaderTestPlayer');
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
BulkLoaderTestPlayer::create(array('Name' => 'Vincent', 'Status' => 'Available'))->write();
|
||||
}
|
||||
|
||||
public function testBulkLoaderResultCreated()
|
||||
{
|
||||
$results = BulkLoader_Result::create();
|
||||
$player = BulkLoaderTestPlayer::create(array('Name' => 'Rangi', 'Status' => 'Possible'));
|
||||
$player->write();
|
||||
$results->addCreated($player, 'Speedster');
|
||||
|
||||
$this->assertEquals($results->CreatedCount(), 1);
|
||||
$this->assertSame(
|
||||
'Rangi',
|
||||
$results->Created()->find('Name', 'Rangi')->Name,
|
||||
'The player Rangi should be recorded as created in $results'
|
||||
);
|
||||
$this->assertSame(
|
||||
'Possible',
|
||||
$results->Created()->find('Name', 'Rangi')->Status,
|
||||
'The player Rangi should have Status of "Possible" in $results'
|
||||
);
|
||||
$this->assertSame(
|
||||
'Speedster',
|
||||
$results->Created()->find('Name', 'Rangi')->_BulkLoaderMessage,
|
||||
'Rangi should have _BulkLoaderMessage of Speedster'
|
||||
);
|
||||
}
|
||||
|
||||
public function testBulkLoaderResultDeleted()
|
||||
{
|
||||
$results = BulkLoader_Result::create();
|
||||
$player = BulkLoaderTestPlayer::get()->find('Name', 'Vincent');
|
||||
$results->addDeleted($player, 'Retired');
|
||||
$player->delete();
|
||||
|
||||
$this->assertEquals($results->DeletedCount(), 1);
|
||||
$this->assertSame(
|
||||
'Vincent',
|
||||
$results->Deleted()->find('Name', 'Vincent')->Name,
|
||||
'The player Vincent should be recorded as deleted'
|
||||
);
|
||||
$this->assertSame(
|
||||
'Retired',
|
||||
$results->Deleted()->find('Name', 'Vincent')->_BulkLoaderMessage,
|
||||
'Vincent should have a _BulkLoaderMessage of Retired'
|
||||
);
|
||||
}
|
||||
|
||||
public function testBulkLoaderResultUpdated()
|
||||
{
|
||||
$results = BulkLoader_Result::create();
|
||||
$player = BulkLoaderTestPlayer::get()->find('Name', 'Vincent');
|
||||
$player->Status = 'Unavailable';
|
||||
$player->write();
|
||||
$results->addUpdated($player, 'Injured');
|
||||
|
||||
$this->assertEquals($results->UpdatedCount(), 1);
|
||||
$this->assertSame(
|
||||
'Vincent',
|
||||
$results->Updated()->find('Name', 'Vincent')->Name,
|
||||
'The player Vincent should be recorded as updated'
|
||||
);
|
||||
$this->assertSame(
|
||||
'Unavailable',
|
||||
$results->Updated()->find('Name', 'Vincent')->Status,
|
||||
'The player Vincent should have a Status of Unavailable'
|
||||
);
|
||||
$this->assertSame(
|
||||
'Injured',
|
||||
$results->Updated()->find('Name', 'Vincent')->_BulkLoaderMessage,
|
||||
'Vincent is injured'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class BulkLoaderTestPlayer extends DataObject implements TestOnly
|
||||
{
|
||||
private static $db = array(
|
||||
'Name' => 'Varchar',
|
||||
'Status' => 'Varchar',
|
||||
);
|
||||
}
|
@ -277,6 +277,45 @@ class DataQueryTest extends SapphireTest {
|
||||
$this->resetDBSchema(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that getFinalisedQuery can include all tables
|
||||
*/
|
||||
public function testConditionsIncludeTables() {
|
||||
// Including filter on parent table only doesn't pull in second
|
||||
$query = new DataQuery('DataQueryTest_C');
|
||||
$query->sort('"SortOrder"');
|
||||
$query->where(array(
|
||||
'"DataQueryTest_C"."Title" = ?' => array('First')
|
||||
));
|
||||
$result = $query->getFinalisedQuery(array('Title'));
|
||||
$from = $result->getFrom();
|
||||
$this->assertContains('DataQueryTest_C', array_keys($from));
|
||||
$this->assertNotContains('DataQueryTest_E', array_keys($from));
|
||||
|
||||
// Including filter on sub-table requires it
|
||||
$query = new DataQuery('DataQueryTest_C');
|
||||
$query->sort('"SortOrder"');
|
||||
$query->where(array(
|
||||
'"DataQueryTest_C"."Title" = ? OR "DataQueryTest_E"."SortOrder" > ?' => array(
|
||||
'First', 2
|
||||
)
|
||||
));
|
||||
$result = $query->getFinalisedQuery(array('Title'));
|
||||
$from = $result->getFrom();
|
||||
|
||||
// Check that including "SortOrder" prompted inclusion of DataQueryTest_E table
|
||||
$this->assertContains('DataQueryTest_C', array_keys($from));
|
||||
$this->assertContains('DataQueryTest_E', array_keys($from));
|
||||
$arrayResult = iterator_to_array($result->execute());
|
||||
$first = array_shift($arrayResult);
|
||||
$this->assertNotNull($first);
|
||||
$this->assertEquals('First', $first['Title']);
|
||||
$second = array_shift($arrayResult);
|
||||
$this->assertNotNull($second);
|
||||
$this->assertEquals('Last', $second['Title']);
|
||||
$this->assertEmpty(array_shift($arrayResult));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user