Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
38fdab6b
Unverified
Commit
38fdab6b
authored
Feb 10, 2020
by
alexpott
Browse files
Issue
#3100046
by alexpott, Wim Leers, super_romeo, quietone: Duplicate column name 'type'
parent
af036f62
Changes
2
Hide whitespace changes
Inline
Side-by-side
core/modules/field/src/Plugin/migrate/source/d7/FieldOptionTranslation.php
View file @
38fdab6b
...
...
@@ -23,9 +23,16 @@ public function query() {
->
condition
(
'objectid'
,
'#allowed_values'
);
// Add all i18n and locales_target fields.
$query
->
fields
(
'i18n'
)
->
fields
(
'i18n'
,
[
// All table fields except lid and type.
'textgroup'
,
'context'
,
'objectid'
,
'property'
,
'objectindex'
,
'format'
,
])
->
fields
(
'lt'
);
$query
->
addField
(
'fc'
,
'type'
);
$query
->
addField
(
'fci'
,
'bundle'
);
$query
->
addField
(
'i18n'
,
'lid'
,
'i18n_lid'
);
$query
->
addField
(
'i18n'
,
'type'
,
'i18n_type'
);
...
...
core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldOptionTranslationTest.php
View file @
38fdab6b
...
...
@@ -105,6 +105,9 @@ public function testFieldOptionTranslation() {
],
];
$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
());
}
}
alexpott
@alexpott
mentioned in commit
62395e72
·
Feb 10, 2020
mentioned in commit
62395e72
mentioned in commit 62395e72250fc29b4de3314f71da94ba623bdbac
Toggle commit list
alexpott
@alexpott
mentioned in commit
95e728a3
·
Feb 10, 2020
mentioned in commit
95e728a3
mentioned in commit 95e728a3c72716b836e9b298bb809b00e5c3a770
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment