Adding a 'OR' condition to query
The solution seemed to be putting the explicit "IN" in the query, making the simplified version:

$entity_ids = $query
    -&gt;condition('attributes.color', array('red', 'green'), 'IN')
    -&gt;condition('attributes.building_type', 'bikeshed')
    -&gt;execute();