Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-22 04:36:11 +01:00
Code Releases Activity

BUGFIX: Do not add non existing db columns to fields array

Browse source 
As TCA might contain columns which do not exist in DB, filter them out.
This commit is contained in:
Daniel Siepmann 2017-10-14 12:27:48 +02:00
parent 5509d4a56b
commit 2c466854b2
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
3 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Classes/Domain/Index/TcaIndexer/TcaTableService.php
View file

@ -181,7 +181,10 @@ class TcaTableService
array_filter(
array_keys($this->tca['columns']),
function ($columnName) {
return !$this->isSystemField($columnName);
return !$this->isSystemField($columnName)
&& !$this->isUserField($columnName)
&& !$this->isPassthroughField($columnName)
;
}
)
);
@ -249,6 +252,18 @@ class TcaTableService
return in_array($columnName, $systemFields);
}
protected function isUserField(string $columnName) : bool
{
$config = $this->getColumnConfig($columnName);
return isset($config['type']) && $config['type'] === 'user';
}
protected function isPassthroughField(string $columnName) : bool
{
$config = $this->getColumnConfig($columnName);
return isset($config['type']) && $config['type'] === 'passthrough';
}
/**
* @param string $columnName
* @return array

2
Tests/Functional/Hooks/DataHandler/ProcessesAllowedTablesTest.php
View file

@ -100,7 +100,7 @@ class ProcessesAllowedTablesTest extends AbstractDataHandlerTest
->with(
$this->equalTo('tt_content'),
$this->callback(function ($record) {
return isset($record['uid']) && $record['uid'] === '2'
return isset($record['uid']) && $record['uid'] === 2
&& isset($record['pid']) && $record['pid'] === 1
&& isset($record['header']) && $record['header'] === 'a new record'
;

49
Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php
View file

@ -21,6 +21,7 @@ namespace Codappix\SearchCore\Tests\Unit\Domain\Index\TcaIndexer;
*/
use Codappix\SearchCore\Configuration\ConfigurationContainerInterface;
use Codappix\SearchCore\Domain\Index\TcaIndexer\RelationResolver;
use Codappix\SearchCore\Domain\Index\TcaIndexer\TcaTableService;
use Codappix\SearchCore\Tests\Unit\AbstractUnitTestCase;
@ -98,4 +99,52 @@ class TcaTableServiceTest extends AbstractUnitTestCase
$whereClause->getParameters()
);
}
/**
* @test
*/
public function allConfiguredAndAllowedTcaColumnsAreReturnedAsFields()
{
$GLOBALS['TCA']['test_table'] = [
'ctrl' => [
'languageField' => 'sys_language',
],
'columns' => [
'sys_language' => [],
't3ver_oid' => [],
'available_column' => [
'config' => [
'type' => 'input',
],
],
'user_column' => [
'config' => [
'type' => 'user',
],
],
'passthrough_column' => [
'config' => [
'type' => 'passthrough',
],
],
],
];
$subject = new TcaTableService(
'test_table',
$this->getMockBuilder(RelationResolver::class)->getMock(),
$this->configuration
);
$this->inject($subject, 'logger', $this->getMockedLogger());
$this->assertSame(
[
'test_table.uid',
'test_table.pid',
'test_table.available_column',
],
$subject->getFields(),
''
);
unset($GLOBALS['TCA']['test_table']);
}
}