Merge pull request #108 from Inventis/jan/incomplete_rule_identifier

ensure different executors are used for different query builders
K-Phoen · Sep 18, 2018 · ff32ec1 · ff32ec1
2 parents 08c1ece + 43a5309
commit ff32ec1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Target/DoctrineORM/DoctrineORM.php b/src/Target/DoctrineORM/DoctrineORM.php
@@ -4,6 +4,7 @@
 
 namespace RulerZ\Target\DoctrineORM;
 
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 
 use RulerZ\Compiler\Context;
@@ -43,8 +44,16 @@ public function getRuleIdentifierHint(string $rule, Context $context): string
     {
         $aliases = implode('', $context['root_aliases']);
         $entities = implode('', $context['root_entities']);
+        $joined = '';
 
-        return $aliases.$entities;
+        /** @var Expr\Join[] $joins */
+        foreach ($context['joins'] as $rootEntity => $joins) {
+            foreach ($joins as $join) {
+                $joined .= $join->getAlias().$join->getJoin();
+            }
+        }
+
+        return $aliases.$entities.$joined;
     }
 
     /**

diff --git a/tests/spec/RulerZ/Target/DoctrineORM/DoctrineORMSpec.php b/tests/spec/RulerZ/Target/DoctrineORM/DoctrineORMSpec.php
@@ -5,6 +5,7 @@
 namespace spec\RulerZ\Target\DoctrineORM;
 
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 
@@ -125,6 +126,19 @@ public function it_does_not_duplicate_join_tables()
         ]);
     }
 
+    public function it_generates_a_different_identifier_for_contexts_with_joins(Expr\Join $join)
+    {
+        $rule = 'group.name = "ADMIN" or group.name = "OWNER"';
+        $joinLessContext = $this->createContext();
+        $join->getJoin()->willReturn('test.group');
+        $join->getAlias()->willReturn('grp');
+        $contextWithJoins = $this->createContext();
+        $contextWithJoins['joins'] = ['some_root' => [$join->getWrappedObject()]];
+
+        $joinLessIdentifier = $this->getRuleIdentifierHint($rule, $joinLessContext)->getWrappedObject();
+        $this->getRuleIdentifierHint($rule, $contextWithJoins)->shouldNotReturn($joinLessIdentifier);
+    }
+
     public function it_uses_the_metadata_to_detect_invalid_attribute_access()
     {
         $context = $this->createContext();