Issue #3100046 by alexpott, Wim Leers, super_romeo, quietone: Duplicate column name 'type'

(cherry picked from commit 38fdab6b)

core/modules/field/src/Plugin/migrate/source/d7/FieldOptionTranslation.php

@@ -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

@@ -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());
   }
 
 }