Lateral Join: Change method names to include "sub"

Author: Bakke

src/Illuminate/Database/Query/Builder.php

@@ -587,14 +587,14 @@ public function joinSub($query, $as, $first, $operator = null, $second = null, $
     }
 
     /**
-     * Add a lateral join clause to the query.
+     * Add a lateral subquery join clause to the query.
      *
      * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|string  $query
      * @param  string  $as
      * @param  string  $type
      * @return $this
      */
-    public function joinLateral($query, $as, $type = 'inner')
+    public function joinSubLateral($query, $as, $type = 'inner')
     {
         [$query, $bindings] = $this->createSub($query);
 
@@ -608,15 +608,15 @@ public function joinLateral($query, $as, $type = 'inner')
     }
 
     /**
-     * Add a lateral left join to the query.
+     * Add a lateral subquery left join to the query.
      *
      * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|string  $query
      * @param  string  $as
      * @return $this
      */
-    public function leftJoinLateral($query, $as)
+    public function leftJoinSubLateral($query, $as)
     {
-        return $this->joinLateral($query, $as, 'left');
+        return $this->joinSubLateral($query, $as, 'left');
     }
 
     /**

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -183,23 +183,23 @@ protected function compileJoins(Builder $query, $joins)
             $tableAndNestedJoins = is_null($join->joins) ? $table : '('.$table.$nestedJoins.')';
 
             if ($join->lateral) {
-                return $this->joinLateral($join, $tableAndNestedJoins);
+                return $this->joinSubLateral($join, $tableAndNestedJoins);
             }
 
             return trim("{$join->type} join {$tableAndNestedJoins} {$this->compileWheres($join)}");
         })->implode(' ');
     }
 
     /**
-     * Compile a "lateral join" clause.
+     * Compile a lateral subquery join clause.
      *
      * @param  \Illuminate\Database\Query\JoinClause  $join
      * @param  string  $expression
      * @return string
      *
      * @throws \RuntimeException
      */
-    public function joinLateral(JoinClause $join, string $expression)
+    public function joinSubLateral(JoinClause $join, string $expression)
     {
         throw new RuntimeException('This database engine does not support lateral joins.');
     }

src/Illuminate/Database/Query/Grammars/MySqlGrammar.php

@@ -235,13 +235,13 @@ protected function compileUpdateColumns(Builder $query, array $values)
     }
 
     /**
-     * Compile a "lateral join" clause.
+     * Compile a lateral subquery join clause.
      *
      * @param  \Illuminate\Database\Query\JoinClause  $join
      * @param  string  $expression
      * @return string
      */
-    public function joinLateral(JoinClause $join, string $expression)
+    public function joinSubLateral(JoinClause $join, string $expression)
     {
         return trim("{$join->type} join lateral {$expression} on true");
     }

src/Illuminate/Database/Query/Grammars/PostgresGrammar.php

@@ -387,13 +387,13 @@ protected function compileUpdateColumns(Builder $query, array $values)
     }
 
     /**
-     * Compile a "lateral join" clause.
+     * Compile a lateral subquery join clause.
      *
      * @param  \Illuminate\Database\Query\JoinClause  $join
      * @param  string  $expression
      * @return string
      */
-    public function joinLateral(JoinClause $join, string $expression)
+    public function joinSubLateral(JoinClause $join, string $expression)
     {
         return trim("{$join->type} join lateral {$expression} on true");
     }

src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php

@@ -388,13 +388,13 @@ protected function compileUpdateWithJoins(Builder $query, $table, $columns, $whe
     }
 
     /**
-     * Compile a "lateral join" clause.
+     * Compile a lateral subquery join clause.
      *
      * @param  \Illuminate\Database\Query\JoinClause  $join
      * @param  string  $expression
      * @return string
      */
-    public function joinLateral(JoinClause $join, string $expression)
+    public function joinSubLateral(JoinClause $join, string $expression)
     {
         $type = $join->type == 'left' ? 'outer' : 'cross';
 

tests/Database/DatabaseQueryBuilderTest.php

@@ -2526,16 +2526,16 @@ public function testRightJoinSub()
         $builder->from('users')->rightJoinSub(['foo'], 'sub', 'users.id', '=', 'sub.id');
     }
 
-    public function testJoinLateral()
+    public function testJoinSubLateral()
     {
         $builder = $this->getMySqlBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->joinLateral('select * from `contacts` where `contracts`.`user_id` = `users`.`id`', 'sub');
+        $builder->from('users')->joinSubLateral('select * from `contacts` where `contracts`.`user_id` = `users`.`id`', 'sub');
         $this->assertSame('select * from `users` inner join lateral (select * from `contacts` where `contracts`.`user_id` = `users`.`id`) as `sub` on true', $builder->toSql());
 
         $builder = $this->getMySqlBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->joinLateral(function ($q) {
+        $builder->from('users')->joinSubLateral(function ($q) {
             $q->from('contacts')->whereColumn('contracts.user_id', 'users.id');
         }, 'sub');
         $this->assertSame('select * from `users` inner join lateral (select * from `contacts` where `contracts`.`user_id` = `users`.`id`) as `sub` on true', $builder->toSql());
@@ -2545,7 +2545,7 @@ public function testJoinLateral()
         $sub = $this->getMySqlBuilder();
         $sub->getConnection()->shouldReceive('getDatabaseName');
         $eloquentBuilder = new EloquentBuilder($sub->from('contacts')->whereColumn('contracts.user_id', 'users.id'));
-        $builder->from('users')->joinLateral($eloquentBuilder, 'sub');
+        $builder->from('users')->joinSubLateral($eloquentBuilder, 'sub');
         $this->assertSame('select * from `users` inner join lateral (select * from `contacts` where `contracts`.`user_id` = `users`.`id`) as `sub` on true', $builder->toSql());
 
         $sub1 = $this->getMySqlBuilder();
@@ -2558,7 +2558,7 @@ public function testJoinLateral()
 
         $builder = $this->getMySqlBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->joinLateral($sub1, 'sub1')->joinLateral($sub2, 'sub2');
+        $builder->from('users')->joinSubLateral($sub1, 'sub1')->joinSubLateral($sub2, 'sub2');
 
         $expected = 'select * from `users` ';
         $expected .= 'inner join lateral (select * from `contacts` where `contracts`.`user_id` = `users`.`id` and `name` = ?) as `sub1` on true ';
@@ -2569,69 +2569,69 @@ public function testJoinLateral()
 
         $this->expectException(InvalidArgumentException::class);
         $builder = $this->getMySqlBuilder();
-        $builder->from('users')->joinLateral(['foo'], 'sub');
+        $builder->from('users')->joinSubLateral(['foo'], 'sub');
     }
 
-    public function testJoinLateralSQLite()
+    public function testJoinSubLateralSQLite()
     {
         $this->expectException(RuntimeException::class);
         $builder = $this->getSQLiteBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->joinLateral(function ($q) {
+        $builder->from('users')->joinSubLateral(function ($q) {
             $q->from('contacts')->whereColumn('contracts.user_id', 'users.id');
         }, 'sub')->toSql();
     }
 
-    public function testJoinLateralPostgres()
+    public function testJoinSubLateralPostgres()
     {
         $builder = $this->getPostgresBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->joinLateral(function ($q) {
+        $builder->from('users')->joinSubLateral(function ($q) {
             $q->from('contacts')->whereColumn('contracts.user_id', 'users.id');
         }, 'sub');
         $this->assertSame('select * from "users" inner join lateral (select * from "contacts" where "contracts"."user_id" = "users"."id") as "sub" on true', $builder->toSql());
     }
 
-    public function testJoinLateralSqlServer()
+    public function testJoinSubLateralSqlServer()
     {
         $builder = $this->getSqlServerBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->joinLateral(function ($q) {
+        $builder->from('users')->joinSubLateral(function ($q) {
             $q->from('contacts')->whereColumn('contracts.user_id', 'users.id');
         }, 'sub');
         $this->assertSame('select * from [users] cross apply (select * from [contacts] where [contracts].[user_id] = [users].[id]) as [sub]', $builder->toSql());
     }
 
-    public function testJoinLateralWithPrefix()
+    public function testJoinSubLateralWithPrefix()
     {
         $builder = $this->getMySqlBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
         $builder->getGrammar()->setTablePrefix('prefix_');
-        $builder->from('users')->joinLateral('select * from `contacts` where `contracts`.`user_id` = `users`.`id`', 'sub');
+        $builder->from('users')->joinSubLateral('select * from `contacts` where `contracts`.`user_id` = `users`.`id`', 'sub');
         $this->assertSame('select * from `prefix_users` inner join lateral (select * from `contacts` where `contracts`.`user_id` = `users`.`id`) as `prefix_sub` on true', $builder->toSql());
     }
 
-    public function testLeftJoinLateral()
+    public function testLeftJoinSubLateral()
     {
         $builder = $this->getMySqlBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
 
         $sub = $this->getMySqlBuilder();
         $sub->getConnection()->shouldReceive('getDatabaseName');
 
-        $builder->from('users')->leftJoinLateral($sub->from('contacts')->whereColumn('contracts.user_id', 'users.id'), 'sub');
+        $builder->from('users')->leftJoinSubLateral($sub->from('contacts')->whereColumn('contracts.user_id', 'users.id'), 'sub');
         $this->assertSame('select * from `users` left join lateral (select * from `contacts` where `contracts`.`user_id` = `users`.`id`) as `sub` on true', $builder->toSql());
 
         $this->expectException(InvalidArgumentException::class);
         $builder = $this->getBuilder();
-        $builder->from('users')->leftJoinLateral(['foo'], 'sub');
+        $builder->from('users')->leftJoinSubLateral(['foo'], 'sub');
     }
 
-    public function testLeftJoinLateralSqlServer()
+    public function testLeftJoinSubLateralSqlServer()
     {
         $builder = $this->getSqlServerBuilder();
         $builder->getConnection()->shouldReceive('getDatabaseName');
-        $builder->from('users')->leftJoinLateral(function ($q) {
+        $builder->from('users')->leftJoinSubLateral(function ($q) {
             $q->from('contacts')->whereColumn('contracts.user_id', 'users.id');
         }, 'sub');
         $this->assertSame('select * from [users] outer apply (select * from [contacts] where [contracts].[user_id] = [users].[id]) as [sub]', $builder->toSql());