tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7945 from kinglozzer/indexual-healing

Browse Source 
FIX: Don't auto-generate indexes for Text field types (fixes #7900)
This commit is contained in:
Robbie Averill 2018-04-10 08:23:18 +12:00 committed by GitHub
commit cd7cb225a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
model/DataObject.php
View File

@ -1789,7 +1789,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
$result = $result->alterDataQuery(function($query) use ($extraFields) { $result = $result->alterDataQuery(function($query) use ($extraFields) {
$query->setQueryParam('Component.ExtraFields', $extraFields); $query->setQueryParam('Component.ExtraFields', $extraFields);
}); });
if($this->model) $result->setDataModel($this->model); if($this->model) $result->setDataModel($this->model);
$this->extend('updateManyManyComponents', $result); $this->extend('updateManyManyComponents', $result);
@ -3421,7 +3421,15 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
continue; continue;
} }
if ($this->hasOwnTableDatabaseField($column) && !array_key_exists($column, $indexes)) { list($fieldType) = SS_Object::parse_class_spec($this->db($column));
$isAutoIndexable = (Config::inst()->get($fieldType, 'auto_indexable')
|| Config::inst()->get("DB{$fieldType}", 'auto_indexable'));
if (
$this->hasOwnTableDatabaseField($column)
&& !array_key_exists($column, $indexes)
&& $isAutoIndexable
) {
$indexes[$column] = true; $indexes[$column] = true;
} }
} catch (InvalidArgumentException $e) { } } catch (InvalidArgumentException $e) { }
@ -3754,7 +3762,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/ */
public function summaryFields() { public function summaryFields() {
$rawFields = $this->stat('summary_fields'); $rawFields = $this->stat('summary_fields');
$fields = array(); $fields = array();
// Merge associative / numeric keys // Merge associative / numeric keys
if (is_array($rawFields)) { if (is_array($rawFields)) {

8
model/fieldtypes/DBField.php
View File

@ -60,6 +60,14 @@ abstract class DBField extends ViewableData {
*/ */
private static $default_search_filter_class = 'PartialMatchFilter'; private static $default_search_filter_class = 'PartialMatchFilter';
/**
* Flag to indicate whether this data type is safe to automatically generate an index for
*
* @var bool
* @config
*/
private static $auto_indexable = true;
/** /**
* @var $default mixed Default-value in the database. * @var $default mixed Default-value in the database.
* Might be overridden on DataObject-level, but still useful for setting defaults on * Might be overridden on DataObject-level, but still useful for setting defaults on

2
model/fieldtypes/Text.php
View File

@ -32,6 +32,8 @@ class Text extends StringField {
'LimitWordCountXML' => 'HTMLText', 'LimitWordCountXML' => 'HTMLText',
); );
private static $auto_indexable = false;
/** /**
* (non-PHPdoc) * (non-PHPdoc)
* @see DBField::requireField() * @see DBField::requireField()

17
tests/model/DataObjectSchemaGenerationTest.php
View File

@ -216,6 +216,11 @@ class DataObjectSchemaGenerationTest extends SapphireTest {
$indexes = $object->databaseIndexes(); $indexes = $object->databaseIndexes();
$this->assertArrayHasKey('Sort', $indexes); $this->assertArrayHasKey('Sort', $indexes);
$this->assertEquals('unique', $indexes['Sort']); $this->assertEquals('unique', $indexes['Sort']);
// make sure Text fields don't get indexes automatically - these can be db-driver dependent
$object = new DataObjectSchemaGenerationTest_SortedByText();
$indexes = $object->databaseIndexes();
$this->assertArrayNotHasKey('Description', $indexes);
} }
} }
@ -265,4 +270,14 @@ class DataObjectSchemaGenerationTest_Sorted extends DataObject implements TestOn
); );
private static $default_sort = "Sort"; private static $default_sort = "Sort";
} }
class DataObjectSchemaGenerationTest_SortedByText extends DataObject implements TestOnly {
private static $db = array(
'Title' => 'Varchar',
'Description' => 'Text',
'Sort' => 'Int',
);
private static $default_sort = "Description";
}