-

Author: GromNaN

src/Relations/HasOne.php

@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne as EloquentHasOne;
+use Illuminate\Support\Arr;
+
+use function is_null;
 
 class HasOne extends EloquentHasOne
 {
@@ -38,6 +41,37 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
         return $query->select($foreignKey)->where($foreignKey, 'exists', true);
     }
 
+    protected function newOneOfManySubQuery($groupBy, $columns = null, $aggregate = null)
+    {
+        $subQuery = $this->query->getModel()
+            ->newQuery()
+            ->withoutGlobalScopes($this->removedScopes());
+
+        foreach (Arr::wrap($groupBy) as $group) {
+            $subQuery->groupBy($this->qualifyRelatedColumn($group));
+        }
+
+        if (! is_null($columns)) {
+            foreach ($columns as $key => $column) {
+                $aggregatedColumn = $subQuery->qualifyColumn($column);
+
+                if ($key === 0) {
+                    $aggregatedColumn = ['$' . strtolower($aggregate) => '$' . $aggregatedColumn];
+                } else {
+                    $aggregatedColumn = ['$min' => '$' . $aggregatedColumn];
+                }
+
+                $subQuery->addSelect([$column . '_aggregate' => $aggregatedColumn]);
+            }
+        }
+
+        $this->addOneOfManySubQueryConstraints($subQuery, column: null, aggregate: $aggregate);
+
+        return $subQuery;
+
+        parent::newOneOfManySubQuery($groupBy, $columns, $aggregate);
+    }
+
     /**
      * Get the name of the "where in" method for eager loading.
      *

tests/Eloquent/DatabaseEloquentHasOneOfManyTest.php

@@ -105,7 +105,7 @@ public function testEagerLoadingAppliesConstraintsToInnerJoinSubQuery()
         $user = HasOneOfManyTestUser::create();
         $relation = $user->latest_login();
         $relation->addEagerConstraints([$user]);
-        $this->assertSame('select MAX("logins"."id") as "id_aggregate", "logins"."user_id" from "logins" where "logins"."user_id" = ? and "logins"."user_id" is not null and "logins"."user_id" in (1) group by "logins"."user_id"', $relation->getOneOfManySubQuery()->toSql());
+        $this->assertSame('select MAX("logins"."id") as "id_aggregate", "logins"."user_id" from "logins" where "logins"."user_id" = ? and "logins"."user_id" is not null and "logins"."user_id" in (1) group by "logins"."user_id"', $relation->getOneOfManySubQuery()->toMql());
     }
 
     public function testGlobalScopeIsNotAppliedWhenRelationIsDefinedWithoutGlobalScope()
@@ -117,7 +117,7 @@ public function testGlobalScopeIsNotAppliedWhenRelationIsDefinedWithoutGlobalSco
         $user = HasOneOfManyTestUser::create();
         $relation = $user->latest_login_without_global_scope();
         $relation->addEagerConstraints([$user]);
-        $this->assertSame('select "logins".* from "logins" inner join (select MAX("logins"."id") as "id_aggregate", "logins"."user_id" from "logins" where "logins"."user_id" = ? and "logins"."user_id" is not null and "logins"."user_id" in (1) group by "logins"."user_id") as "latestOfMany" on "latestOfMany"."id_aggregate" = "logins"."id" and "latestOfMany"."user_id" = "logins"."user_id" where "logins"."user_id" = ? and "logins"."user_id" is not null', $relation->getQuery()->toSql());
+        $this->assertSame('select "logins".* from "logins" inner join (select MAX("logins"."id") as "id_aggregate", "logins"."user_id" from "logins" where "logins"."user_id" = ? and "logins"."user_id" is not null and "logins"."user_id" in (1) group by "logins"."user_id") as "latestOfMany" on "latestOfMany"."id_aggregate" = "logins"."id" and "latestOfMany"."user_id" = "logins"."user_id" where "logins"."user_id" = ? and "logins"."user_id" is not null', $relation->getQuery()->toMql());
 
         HasOneOfManyTestLogin::addGlobalScope('test', function ($query) {
         });
@@ -131,7 +131,7 @@ public function testGlobalScopeIsNotAppliedWhenRelationIsDefinedWithoutGlobalSco
 
         $user = HasOneOfManyTestUser::create();
         $relation = $user->price_without_global_scope();
-        $this->assertSame('select "prices".* from "prices" inner join (select max("prices"."id") as "id_aggregate", min("prices"."published_at") as "published_at_aggregate", "prices"."user_id" from "prices" inner join (select max("prices"."published_at") as "published_at_aggregate", "prices"."user_id" from "prices" where "published_at" < ? and "prices"."user_id" = ? and "prices"."user_id" is not null group by "prices"."user_id") as "price_without_global_scope" on "price_without_global_scope"."published_at_aggregate" = "prices"."published_at" and "price_without_global_scope"."user_id" = "prices"."user_id" where "published_at" < ? group by "prices"."user_id") as "price_without_global_scope" on "price_without_global_scope"."id_aggregate" = "prices"."id" and "price_without_global_scope"."published_at_aggregate" = "prices"."published_at" and "price_without_global_scope"."user_id" = "prices"."user_id" where "prices"."user_id" = ? and "prices"."user_id" is not null', $relation->getQuery()->toSql());
+        $this->assertSame('select "prices".* from "prices" inner join (select max("prices"."id") as "id_aggregate", min("prices"."published_at") as "published_at_aggregate", "prices"."user_id" from "prices" inner join (select max("prices"."published_at") as "published_at_aggregate", "prices"."user_id" from "prices" where "published_at" < ? and "prices"."user_id" = ? and "prices"."user_id" is not null group by "prices"."user_id") as "price_without_global_scope" on "price_without_global_scope"."published_at_aggregate" = "prices"."published_at" and "price_without_global_scope"."user_id" = "prices"."user_id" where "published_at" < ? group by "prices"."user_id") as "price_without_global_scope" on "price_without_global_scope"."id_aggregate" = "prices"."id" and "price_without_global_scope"."published_at_aggregate" = "prices"."published_at" and "price_without_global_scope"."user_id" = "prices"."user_id" where "prices"."user_id" = ? and "prices"."user_id" is not null', $relation->getQuery()->toMql());
 
         HasOneOfManyTestPrice::addGlobalScope('test', function ($query) {
         });
@@ -145,7 +145,7 @@ public function testQualifyingSubSelectColumn()
 
     public function testItFailsWhenUsingInvalidAggregate()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid aggregate [count] used within ofMany relation. Available aggregates: MIN, MAX');
         $user = HasOneOfManyTestUser::make();
         $user->latest_login_with_invalid_aggregate();
@@ -430,7 +430,8 @@ public function testEagerLoadingWithMultipleAggregates()
 
     public function testWithExists()
     {
-        $user = HasOneOfManyTestUser::create();
+        self::markTestSkipped('withExists not supported, PHPORM-285');
+        HasOneOfManyTestUser::create();
 
         $user = HasOneOfManyTestUser::withExists('latest_login')->first();
         $this->assertFalse($user->latest_login_exists);
@@ -442,7 +443,8 @@ public function testWithExists()
 
     public function testWithExistsWithConstraintsInJoinSubSelect()
     {
-        $user = HasOneOfManyTestUser::create();
+        self::markTestSkipped('withExists not supported, PHPORM-285');
+        HasOneOfManyTestUser::create();
 
         $user = HasOneOfManyTestUser::withExists('foo_state')->first();