comparison core/modules/workspaces/src/EntityQuery/Tables.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

       $condition_parts = explode(' = ', $join_condition);
       list($base_table, $id_field) = explode('.', $condition_parts[1]);
 
       if (isset($this->baseTablesEntityType[$base_table])) {
         $entity_type_id = $this->baseTablesEntityType[$base_table];
-        $revision_key = $this->entityManager->getDefinition($entity_type_id)->getKey('revision');
+        $revision_key = $this->entityTypeManager->getActiveDefinition($entity_type_id)->getKey('revision');
 
         if ($id_field === $revision_key || $id_field === 'revision_id') {
           $workspace_association_table = $this->contentWorkspaceTables[$base_table];
           $join_condition = "{$condition_parts[0]} = COALESCE($workspace_association_table.target_entity_revision_id, {$condition_parts[1]})";
         }

    * @return string
    *   The alias of the joined table.
    */
   public function addWorkspaceAssociationJoin($entity_type_id, $base_table_alias, $active_workspace_id) {
     if (!isset($this->contentWorkspaceTables[$base_table_alias])) {
-      $entity_type = $this->entityManager->getDefinition($entity_type_id);
+      $entity_type = $this->entityTypeManager->getActiveDefinition($entity_type_id);
       $id_field = $entity_type->getKey('id');
 
       // LEFT join the Workspace association entity's table so we can properly
       // include live content along with a possible workspace-specific revision.
       $this->contentWorkspaceTables[$base_table_alias] = $this->sqlQuery->leftJoin('workspace_association', NULL, "%alias.target_entity_type_id = '$entity_type_id' AND %alias.target_entity_id = $base_table_alias.$id_field AND %alias.workspace = '$active_workspace_id'");