Case (in)sensitivity for config entity query [#2107309]

Problem/Motivation

Config entity query is a little confused about case (in)sensitivity. This code should return the 'Content' view (from the standard profile) among the results, but it doesn't.

$query = \Drupal::entityQuery('view');
$query->condition('label', 'c', 'CONTAINS');
$result = $query->execute();
debug($result);

Proposed resolution

I assume that the condition value is lowercased before doing the comparison, but the actual values that it's checked against are not.

Remaining tasks

Investigate, propose a resolution.

User interface changes

None.

API changes

Not sure.

#2068655: Entity fields do not support case sensitive queries

Comment	File	Size	Author
#4	2107309-4.patch	6.9 KB	amateescu
#4
#4	interdiff.txt	5 KB	amateescu
#1	2107309-test-only.patch	1.41 KB	amateescu
#1
#1	2107309.patch	2.89 KB	amateescu
#1

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

File	Size
2107309.patch	2.89 KB

2107309-test-only.patch	1.41 KB

Comment #2

dawehner

German

CreditAttribution: dawehner commented 8 October 2013 at 16:58

+++ b/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
@@ -33,6 +34,15 @@ public function compile($configs) {
+
+        // Lowercase condition value(s) for case-insensitive matches.
+        if (is_array($condition['value'])) {
+          $condition['value'] = array_map('Drupal\Component\Utility\Unicode::strtolower', $condition['value']);
+        }
+        else {
+          $condition['value'] = Unicode::strtolower($condition['value']);
+        }
+

\Drupal\Core\Entity\QueryInterface::condition should document that the value is case-insensitive.

Comment #3

8 October 2013 at 18:16

Status:

Needs review

» Needs work

The last submitted patch, 2107309.patch, failed testing.

Comment #4

amateescu CreditAttribution: amateescu commented 8 October 2013 at 21:26

Status:

Needs work

» Needs review

File	Size
interdiff.txt	5 KB
2107309-4.patch	6.9 KB

Fixed those test fails and documented the case-insensitivity aspect.

Comment #5

damiankloip CreditAttribution: damiankloip commented 9 October 2013 at 10:23

+++ b/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
@@ -33,6 +34,15 @@ public function compile($configs) {
+
+        // Lowercase condition value(s) for case-insensitive matches.
+        if (is_array($condition['value'])) {
+          $condition['value'] = array_map('Drupal\Component\Utility\Unicode::strtolower', $condition['value']);
+        }
+        elseif (!is_bool($condition['value'])) {
+          $condition['value'] = Unicode::strtolower($condition['value']);
+        }
+

@@ -150,6 +160,11 @@ protected function matchArray(array $condition, array $data, array $needs_matchi
+      // We always want a case-insensitive match.
+      if (!is_bool($value)) {
+        $value = Unicode::strtolower($value);
+      }

what do you think about all of this logic living in match? Then it's all in one place.

Apart from that, this looks good to me!

Comment #6

amateescu CreditAttribution: amateescu commented 9 October 2013 at 12:18

I deliberately put them in separate places for performance reasons.

The condition array stays the same for the duration of the matching process, so it makes sense to update it as early as possible, while the match() method is invoked multiple times, but not for every property of the config entity, so it doesn't make sense to do the lowercase transformation on all values of the entity.