[8.x] Move the getRelationCountHash method to parent class (Relation) (…

…#35394) * Move the getRelationCountHash method to parent class (relation) * Rename the getRelationCountHash parameter to incrementJoinCount
laravel · Nov 29, 2020 · 2b4b18c · 2b4b18c
1 parent d12b613
commit 2b4b18c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 72 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -40,13 +40,6 @@ class BelongsTo extends Relation
      */
     protected $relationName;
 
-    /**
-     * The count of self joins.
-     *
-     * @var int
-     */
-    protected static $selfJoinCount = 0;
-
     /**
      * Create a new belongs to relationship instance.
      *
@@ -279,17 +272,6 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
         );
     }
 
-    /**
-     * Get a relationship join table hash.
-     *
-     * @param  bool  $incrementJoinCount
-     * @return string
-     */
-    public function getRelationCountHash($incrementJoinCount = true)
-    {
-        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
-    }
-
     /**
      * Determine if the related model has an auto-incrementing ID.
      *

diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -127,13 +127,6 @@ class BelongsToMany extends Relation
      */
     protected $accessor = 'pivot';
 
-    /**
-     * The count of self joins.
-     *
-     * @var int
-     */
-    protected static $selfJoinCount = 0;
-
     /**
      * Create a new belongs to many relationship instance.
      *
@@ -1167,17 +1160,6 @@ public function getExistenceCompareKey()
         return $this->getQualifiedForeignPivotKeyName();
     }
 
-    /**
-     * Get a relationship join table hash.
-     *
-     * @param  bool  $incrementJoinCount
-     * @return string
-     */
-    public function getRelationCountHash($incrementJoinCount = true)
-    {
-        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
-    }
-
     /**
      * Specify that the pivot table has creation and update timestamps.
      *

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -53,13 +53,6 @@ class HasManyThrough extends Relation
      */
     protected $secondLocalKey;
 
-    /**
-     * The count of self joins.
-     *
-     * @var int
-     */
-    protected static $selfJoinCount = 0;
-
     /**
      * Create a new has many through relationship instance.
      *
@@ -596,17 +589,6 @@ public function getRelationExistenceQueryForThroughSelfRelation(Builder $query,
         );
     }
 
-    /**
-     * Get a relationship join table hash.
-     *
-     * @param  bool  $incrementJoinCount
-     * @return string
-     */
-    public function getRelationCountHash($incrementJoinCount = true)
-    {
-        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
-    }
-
     /**
      * Get the qualified foreign key on the related model.
      *

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -22,13 +22,6 @@ abstract class HasOneOrMany extends Relation
      */
     protected $localKey;
 
-    /**
-     * The count of self joins.
-     *
-     * @var int
-     */
-    protected static $selfJoinCount = 0;
-
     /**
      * Create a new has one or many relationship instance.
      *
@@ -363,17 +356,6 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
         );
     }
 
-    /**
-     * Get a relationship join table hash.
-     *
-     * @param  bool  $incrementJoinCount
-     * @return string
-     */
-    public function getRelationCountHash($incrementJoinCount = true)
-    {
-        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
-    }
-
     /**
      * Get the key for comparing against the parent key in "has" query.
      *

diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -62,6 +62,13 @@ abstract class Relation
      */
     public static $tableNameAsMorphType = false;
 
+    /**
+     * The count of self joins.
+     *
+     * @var int
+     */
+    protected static $selfJoinCount = 0;
+
     /**
      * Create a new relation instance.
      *
@@ -220,6 +227,17 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
         );
     }
 
+    /**
+     * Get a relationship join table hash.
+     *
+     * @param  bool $incrementJoinCount
+     * @return string
+     */
+    public function getRelationCountHash($incrementJoinCount = true)
+    {
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
+    }
+
     /**
      * Get all of the primary keys for an array of models.
      *