Issue #3100046 by alexpott, Wim Leers, super_romeo, quietone: Duplicate column name 'type'
parent
af036f62df
commit
38fdab6bd6
|
@ -23,9 +23,16 @@ class FieldOptionTranslation extends Field {
|
||||||
->condition('objectid', '#allowed_values');
|
->condition('objectid', '#allowed_values');
|
||||||
// Add all i18n and locales_target fields.
|
// Add all i18n and locales_target fields.
|
||||||
$query
|
$query
|
||||||
->fields('i18n')
|
->fields('i18n', [
|
||||||
|
// All table fields except lid and type.
|
||||||
|
'textgroup',
|
||||||
|
'context',
|
||||||
|
'objectid',
|
||||||
|
'property',
|
||||||
|
'objectindex',
|
||||||
|
'format',
|
||||||
|
])
|
||||||
->fields('lt');
|
->fields('lt');
|
||||||
$query->addField('fc', 'type');
|
|
||||||
$query->addField('fci', 'bundle');
|
$query->addField('fci', 'bundle');
|
||||||
$query->addField('i18n', 'lid', 'i18n_lid');
|
$query->addField('i18n', 'lid', 'i18n_lid');
|
||||||
$query->addField('i18n', 'type', 'i18n_type');
|
$query->addField('i18n', 'type', 'i18n_type');
|
||||||
|
|
|
@ -105,6 +105,9 @@ class MigrateFieldOptionTranslationTest extends MigrateDrupal7TestBase {
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
$this->assertSame($allowed_values, $config_translation->get('settings.allowed_values'));
|
$this->assertSame($allowed_values, $config_translation->get('settings.allowed_values'));
|
||||||
|
|
||||||
|
// Ensure that the count query works as expected.
|
||||||
|
$this->assertCount(16, $this->getMigration('d7_field_option_translation')->getSourcePlugin());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue