formatting

laravel · Nov 27, 2020 · aec5cca · aec5cca
1 parent 07397ce
commit aec5cca
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -383,10 +383,12 @@ public function withAggregate($relations, $column, $function = null)
             $relation = $this->getRelationWithoutConstraints($name);
 
             if ($function) {
-                $predictedColumn = $this->getQuery()->from === $relation->getQuery()->getQuery()->from ? "{$relation->getRelationCountHash(true)}.$column" : $column;
+                $hashedColumn = $this->getQuery()->from === $relation->getQuery()->getQuery()->from
+                                            ? "{$relation->getRelationCountHash(false)}.$column"
+                                            : $column;
 
                 $expression = sprintf('%s(%s)', $function, $this->getQuery()->getGrammar()->wrap(
-                    $column === '*' ? $column : $relation->getRelated()->qualifyColumn($predictedColumn)
+                    $column === '*' ? $column : $relation->getRelated()->qualifyColumn($hashedColumn)
                 ));
             } else {
                 $expression = $column;

diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -282,12 +282,12 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**

diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -1170,12 +1170,12 @@ public function getExistenceCompareKey()
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php b/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
@@ -599,12 +599,12 @@ public function getRelationExistenceQueryForThroughSelfRelation(Builder $query,
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**

diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -366,12 +366,12 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
     /**
      * Get a relationship join table hash.
      *
-     * @param  bool $lockCount
+     * @param  bool  $incrementJoinCount
      * @return string
      */
-    public function getRelationCountHash($lockCount = false)
+    public function getRelationCountHash($incrementJoinCount = true)
     {
-        return 'laravel_reserved_'.($lockCount ? static::$selfJoinCount : static::$selfJoinCount++);
+        return 'laravel_reserved_'.($incrementJoinCount ? static::$selfJoinCount++ : static::$selfJoinCount);
     }
 
     /**