EntityFieldQuery to support LIKE and IN operators for flagging entity.

What's the difference between the two patches you've posted?

Ah right. Will review when I have a bit more time then :)

(For future reference, you can edit one of your own comments, for instance to say that it's posted in error.)

I'm actually rather confused by what this patch is changing:

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
-    // Convert flag machine names to flag IDs.
-    $flags = flag_get_flags();
-    $fids = array();
-    if (is_array($conditions['bundle']['value'])) {
-      foreach ($conditions['bundle']['value'] as $flag_name) {
-        $fids[] = $flags[$flag_name]->fid;
-      }
-    }
-    else {
-      $flag_name = $conditions['bundle']['value'];
-      $fids = $flags[$flag_name]->fid;
-    }
-
-    $query->propertyCondition('fid', $fids, $conditions['bundle']['operator']);

Why is this getting removed?

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
+    $query->addTag('flagging_flag_names');
...
+ * Implements hook_query_TAG_alter() for flagging_flag_names tag.
+ */
+function flag_query_flagging_flag_names_alter (QueryAlterableInterface $query) {
+    $value = $query->getMetaData('flag_name_value');
+    $operator = $query->getMetaData('flag_name_operator');
+    $query->join('flag', 'f', 'flagging.fid = f.fid');
+    $query->condition('f.name', $value, $operator);  ¶
 }

I don't understand what this is all about. Needs comments!

+++ b/tests/flag.test
@@ -860,3 +860,91 @@ class FlagHookFlagAccessTestCase extends FlagTestCaseBase {
+class FlagEntityFieldQueryTestCase extends FlagTestCaseBase {

Class needs a docblock, and so do its functions and properties. Spacing is needed between them.

Also, your patch has a lot of whitespace issues!

> 1. code is removed because it is not working for LIKE operator.

Yes, but it's needed for other reasons!

Getting there!

Still needs comments. As a maintainer, I want to be able to look at this code in a year's time when I get a bug report about it, and read the comments to understand what it does -- not interpret the code like I'm a human PHP compiler!

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
  * Converts EntityFieldQuery instances on flaggings that have an entity
  * condition on bundles (flag machine names).

This is no longer strictly true.

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
+    $query->addMetaData('flag_name_value', $conditions['bundle']['value']);
+    $query->addMetaData('flag_name_operator', $conditions['bundle']['operator']);
+    $query->addTag('flagging_flag_names');

These lines seem to be:

- adding the query tag for hook_query_TAG_alter() to act on
- adding metadata for that function to find.

They should also go in the more logical order of adding the tag first, then the things it needs.

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
+/**
+ * Implements hook_query_TAG_alter() for flagging_flag_names tag.
+ */
+function flag_query_flagging_flag_names_alter (QueryAlterableInterface $query) {

This should say that it does the work for allowing fids to be used in EFQs.

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
+    $value = $query->getMetaData('flag_name_value');
+    $operator = $query->getMetaData('flag_name_operator');

These lines are pulling the metadata out of the query that we stashed back in flag_entity_query_alter().

+++ b/flag.module
@@ -142,30 +142,28 @@ function flagging_save($flagging) {
+    $query->join('flag', 'f', 'flagging.fid = f.fid');
+    $query->condition('f.name', $value, $operator);

This joins onto the {flag} table so we can add the query conditions on the flag fid.

Yup, sorry for the delay.

I fixed a few things:

- added @see statements to the two hook implementations, as they work in tandem
- missing docblocks on class and methods in the test
- indentation problems
- typos
- removed the private $flag1 in the test class, as there's also $flag2 and $flag3 which aren't declared, so it seems inconsistent.

Here's the modified patch, which I've committed.

Thanks!

git commit -m "Issue #2021191 by bulat: Added support for LIKE and IN operators on flagging entity bundle condition in EntityFieldQuery." --author="bulat "