From 974fc26627ee729f657913bc90ffb701a1e8fb63 Mon Sep 17 00:00:00 2001
From: Ruben de Haas <ruben@comvex.co.jp>
Date: Fri, 4 Oct 2019 14:36:22 +0900
Subject: [PATCH 1/4] Add prefix for related contraint keys when using
 addHybridHas

---
 .../Mongodb/Helpers/QueriesRelationships.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
index 99798ea4f..5b1928d2f 100644
--- a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
+++ b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
@@ -153,16 +153,21 @@ protected function getConstrainedRelatedIds($relations, $operator, $count)
      */
     protected function getRelatedConstraintKey($relation)
     {
-        if ($relation instanceof HasOneOrMany) {
-            return $this->model->getKeyName();
+        $prefix = ! $this->model instanceof Model ? $this->model->getTable().'.' : '';
+
+        if ($relation instanceof HasOneOrMany)
+        {
+            return $prefix.$this->model->getKeyName();
         }
 
-        if ($relation instanceof BelongsTo) {
-            return $relation->getForeignKeyName();
+        if ($relation instanceof BelongsTo)
+        {
+            return $prefix.$relation->getForeignKeyName();
         }
 
-        if ($relation instanceof BelongsToMany && !$this->isAcrossConnections($relation)) {
-            return $this->model->getKeyName();
+        if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation))
+        {
+            return $prefix.$this->model->getKeyName();
         }
 
         throw new Exception(class_basename($relation) . ' is not supported for hybrid query constraints.');

From f0368e538b12d613090499eb964c8e19e6c9727b Mon Sep 17 00:00:00 2001
From: Ruben de Haas <ruben@comvex.co.jp>
Date: Fri, 4 Oct 2019 14:38:18 +0900
Subject: [PATCH 2/4] invert prefix

---
 src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
index 5b1928d2f..fcd67c07e 100644
--- a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
+++ b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
@@ -153,7 +153,7 @@ protected function getConstrainedRelatedIds($relations, $operator, $count)
      */
     protected function getRelatedConstraintKey($relation)
     {
-        $prefix = ! $this->model instanceof Model ? $this->model->getTable().'.' : '';
+        $prefix = $this->model instanceof Model ? '' : $this->model->getTable().'.';
 
         if ($relation instanceof HasOneOrMany)
         {

From 0c113b2b523788eb16f5621238c853e77c477550 Mon Sep 17 00:00:00 2001
From: Ruben de Haas <ruben@comvex.co.jp>
Date: Fri, 4 Oct 2019 15:06:24 +0900
Subject: [PATCH 3/4] fix CS

---
 src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
index fcd67c07e..7c6fec761 100644
--- a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
+++ b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
@@ -155,18 +155,15 @@ protected function getRelatedConstraintKey($relation)
     {
         $prefix = $this->model instanceof Model ? '' : $this->model->getTable().'.';
 
-        if ($relation instanceof HasOneOrMany)
-        {
+        if ($relation instanceof HasOneOrMany) {
             return $prefix.$this->model->getKeyName();
         }
 
-        if ($relation instanceof BelongsTo)
-        {
+        if ($relation instanceof BelongsTo) {
             return $prefix.$relation->getForeignKeyName();
         }
 
-        if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation))
-        {
+        if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation)) {
             return $prefix.$this->model->getKeyName();
         }
 

From 3e11a137e1038431d416ba129279317b2efbeeac Mon Sep 17 00:00:00 2001
From: Ruben <43359232+rdehaas-comvex@users.noreply.github.com>
Date: Mon, 7 Oct 2019 16:11:59 +0900
Subject: [PATCH 4/4] Fix CS

---
 src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
index 7c6fec761..14d72f622 100644
--- a/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
+++ b/src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php
@@ -163,7 +163,7 @@ protected function getRelatedConstraintKey($relation)
             return $prefix.$relation->getForeignKeyName();
         }
 
-        if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation)) {
+        if ($relation instanceof BelongsToMany && !$this->isAcrossConnections($relation)) {
             return $prefix.$this->model->getKeyName();
         }