Brad Czerniak · f6938e81
--- a/src/Plugin/views/relationship/EntityReferenceRevisions.php 0 → 100644
+++ b/src/Plugin/views/relationship/EntityReferenceRevisions.php 0 → 100644
+      'left_table' => $this->tableAlias,
+      'left_field' => $left_field,
+      'table' => $this->definition['field table'],
+      'field' => $this->definition['field field'],
+      'adjusted' => TRUE,
+    ];
+    if (!empty($this->options['required'])) {
+      $first['type'] = 'INNER';
+    }
+
+    if (!empty($this->definition['join_extra'])) {
+      $first['extra'] = $this->definition['join_extra'];
+    }
+
+    if (!empty($def['join_id'])) {
+      $id = $def['join_id'];
--- a/src/Plugin/views/relationship/EntityReferenceRevisions.php 0 → 100644
+++ b/src/Plugin/views/relationship/EntityReferenceRevisions.php 0 → 100644
+    }
+
+    if (!empty($this->definition['join_extra'])) {
+      $first['extra'] = $this->definition['join_extra'];
+    }
+
+    if (!empty($def['join_id'])) {
+      $id = $def['join_id'];
+    }
+    else {
+      $id = 'standard';
+    }
+    $first_join = $this->joinManager->createInstance($id, $first);
+
+
+    $this->first_alias = $this->query->addTable($this->definition['field table'], $this->relationship, $first_join);
--- a/entity_reference_revisions.views.inc
+++ b/entity_reference_revisions.views.inc
+    $table_mapping = $entity_type_manager->getStorage($entity_type_id)
+      ->getTableMapping();
+
+    $entity_type = $entity_types[$entity_type_id];
+    $base_table = $entity_type->getDataTable() ?: $entity_type->getBaseTable();
+
+    /** @var \Drupal\Core\Field\BaseFieldDefinition[] $fields */
+    foreach ($fields as $field) {
+      // Add a relationship to the target entity type.
+      $target_entity_type_id = $field->getSettings()['target_type'];
+      $target_entity_type = $entity_type_manager->getDefinition($target_entity_type_id);
+      $entity_type_id = $field->getTargetEntityTypeId();
+      $entity_type = $entity_type_manager->getDefinition($entity_type_id);
+      $field_name = $field->getName();
+      // Unlimited (-1) or > 1 store field data in a dedicated table.
+      $table = $field->getCardinality() == 1 ? $base_table : $entity_type->getBaseTable() . '__' . $field_name;