EntityFieldQuery with fieldCondition() on OG group audience field breaks if other fieldConditions come before the OG field and there are multiple group content entityypes with

If you are able to reproduce this case in a (failing) simpleTest, we can take care of fixing it :)

> You know I am not good at tests ;)

No one is born knowing simpletest ;) Awesome thanks, we'll go over it!

@DuaelFr can you supply a db dump of the clean installation that you managed to reproduce the problem? Your simple test are reproducing the problem but when i try to reproduce this i'm unable(even with a normal user).

On a clean installation the taxonomy module is enable automatically - no need to enable it in the simple test.

It's OK that you simple test are able to reproduce the problem but i can't debug the problem through the simple test therefor i'll need your db dump. You can make the dump as soon you'll be near your PC.

I've finally managed to track this one down. It's definitely not an edge case and very easy to reproduce. Suppose I want all the nodes in a group that have a value of 'red' in another field:

  $query = new EntityFieldQuery();
  $query->entityCondition('entity_type', 'node');
  $query->entityCondition('bundle', 'test_og_efq');
  
  // OG group
  $query->fieldCondition('og_group_ref', 'target_id', $gid);
  // Field condition on other field.
  $query->fieldCondition('field_test_og_efq_field', 'value', 'red');

  $result = $query->execute();

This works!

  $query = new EntityFieldQuery();
  $query->entityCondition('entity_type', 'node');
  $query->entityCondition('bundle', 'test_og_efq');
  
  // Field condition on other field.
  $query->fieldCondition('field_test_og_efq_field', 'value', 'red');
  // OG group
  $query->fieldCondition('og_group_ref', 'target_id', $gid);

  $result = $query->execute();

This doesn't work! Nodes are returned that are NOT in the requested group.

The only thing I've changed is the order in which the fieldCondition()s are applied. If the fieldCondition() on the OG group audience field is not first, then the query breaks.

Working on a simpletest...

One more thing to get it to break: you need to have other entities that are group content.

This is because the join to og_membership doesn't limit on entity type. Hence what's returned is entity IDs that are possibly not nodes at all!

And another thing:

You need to have one of the entities that you actually want, that's getting retrieved by the query in the OTHER field, match up with an entity of another type in the og_membership table.

Dumping $query as a string at the end of og_query_og_membership_alter() and putting in the values to run it directly in the DB shows the problem.

Here's a test that fails, and a patch that fixes the problem.

I am not sure how legit it is to go reaching into the original EFQ for the entity type -- I've always used an EFQ with an entity type property, so I assume that's a requirement and will therefore always be there?

Huh. Will look into that tomorrow.

Ah, I'd no idea that the entity_type entityCondition() can be multi-valued, or even not there at all!

Here's an updated patch with test + fix.

Wow, thanks guys -- not an easy one! Merged.