Merge branch '10.x'

# Conflicts:
#	.github/workflows/databases.yml

Author: driesvints

.github/workflows/databases.yml

@@ -181,46 +181,46 @@ jobs:
           DB_CONNECTION: pgsql
           DB_PASSWORD: password
 
-  mssql:
-    runs-on: ubuntu-20.04
-
-    services:
-      sqlsrv:
-        image: mcr.microsoft.com/mssql/server:2019-latest
-        env:
-          ACCEPT_EULA: Y
-          SA_PASSWORD: Forge123
-        ports:
-          - 1433:1433
-
-    strategy:
-      fail-fast: true
-
-    name: SQL Server 2019
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
-
-      - name: Execute tests
-        run: vendor/bin/phpunit tests/Integration/Database
-        env:
-          DB_CONNECTION: sqlsrv
-          DB_DATABASE: master
-          DB_USERNAME: SA
-          DB_PASSWORD: Forge123
+  # mssql:
+  #   runs-on: ubuntu-20.04
+
+  #   services:
+  #     sqlsrv:
+  #       image: mcr.microsoft.com/mssql/server:2019-latest
+  #       env:
+  #         ACCEPT_EULA: Y
+  #         SA_PASSWORD: Forge123
+  #       ports:
+  #         - 1433:1433
+
+  #   strategy:
+  #     fail-fast: true
+
+  #   name: SQL Server 2019
+
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v3
+
+  #     - name: Setup PHP
+  #       uses: shivammathur/setup-php@v2
+  #       with:
+  #         php-version: 8.2
+  #         extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc
+  #         tools: composer:v2
+  #         coverage: none
+
+  #     - name: Install dependencies
+  #       uses: nick-fields/retry@v2
+  #       with:
+  #         timeout_minutes: 5
+  #         max_attempts: 5
+  #         command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+  #     - name: Execute tests
+  #       run: vendor/bin/phpunit tests/Integration/Database
+  #       env:
+  #         DB_CONNECTION: sqlsrv
+  #         DB_DATABASE: master
+  #         DB_USERNAME: SA
+  #         DB_PASSWORD: Forge123

src/Illuminate/Auth/Access/Gate.php

@@ -71,7 +71,7 @@ class Gate implements GateContract
     /**
      * The default denial response for gates and policies.
      *
-     * @var Illuminate\Auth\Access\Response|null
+     * @var \Illuminate\Auth\Access\Response|null
      */
     protected $defaultDenialResponse;
 

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

@@ -48,7 +48,7 @@ class SqlServerGrammar extends Grammar
     public function compileSelect(Builder $query)
     {
         // An order by clause is required for SQL Server offset to function...
-        if ($query->offset && empty($query->orders)) {
+        if (($query->offset || $query->limit) && empty($query->orders)) {
             $query->orders[] = ['sql' => '(SELECT 0)'];
         }
 
@@ -266,38 +266,6 @@ protected function compileHavingBitwise($having)
         return '('.$column.' '.$having['operator'].' '.$parameter.') != 0';
     }
 
-    /**
-     * Move the order bindings to be after the "select" statement to account for an order by subquery.
-     *
-     * @param  \Illuminate\Database\Query\Builder  $query
-     * @return array
-     */
-    protected function sortBindingsForSubqueryOrderBy($query)
-    {
-        return Arr::sort($query->bindings, function ($bindings, $key) {
-            return array_search($key, ['select', 'order', 'from', 'join', 'where', 'groupBy', 'having', 'union', 'unionOrder']);
-        });
-    }
-
-    /**
-     * Compile the limit / offset row constraint for a query.
-     *
-     * @param  \Illuminate\Database\Query\Builder  $query
-     * @return string
-     */
-    protected function compileRowConstraint($query)
-    {
-        $start = (int) $query->offset + 1;
-
-        if ($query->limit > 0) {
-            $finish = (int) $query->offset + (int) $query->limit;
-
-            return "between {$start} and {$finish}";
-        }
-
-        return ">= {$start}";
-    }
-
     /**
      * Compile a delete statement without joins into SQL.
      *

tests/Database/DatabaseQueryBuilderTest.php

@@ -2690,7 +2690,7 @@ public function testAggregateFunctions()
     public function testSqlServerExists()
     {
         $builder = $this->getSqlServerBuilder();
-        $builder->getConnection()->shouldReceive('select')->once()->with('select top 1 1 [exists] from [users]', [], true)->andReturn([['exists' => 1]]);
+        $builder->getConnection()->shouldReceive('select')->once()->with('select top 1 1 [exists] from [users] order by (SELECT 0)', [], true)->andReturn([['exists' => 1]]);
         $results = $builder->from('users')->exists();
         $this->assertTrue($results);
     }
@@ -3856,7 +3856,7 @@ public function testSqlServerLimitsAndOffsets()
     {
         $builder = $this->getSqlServerBuilder();
         $builder->select('*')->from('users')->take(10);
-        $this->assertSame('select top 10 * from [users]', $builder->toSql());
+        $this->assertSame('select top 10 * from [users] order by (SELECT 0)', $builder->toSql());
 
         $builder = $this->getSqlServerBuilder();
         $builder->select('*')->from('users')->skip(10)->orderBy('email', 'desc');
@@ -3875,7 +3875,7 @@ public function testSqlServerLimitsAndOffsets()
             return $query->select('created_at')->from('logins')->where('users.name', 'nameBinding')->whereColumn('user_id', 'users.id')->limit(1);
         };
         $builder->select('*')->from('users')->where('email', 'emailBinding')->orderBy($subQuery)->skip(10)->take(10);
-        $this->assertSame('select * from [users] where [email] = ? order by (select top 1 [created_at] from [logins] where [users].[name] = ? and [user_id] = [users].[id]) asc offset 10 rows fetch next 10 rows only', $builder->toSql());
+        $this->assertSame('select * from [users] where [email] = ? order by (select top 1 [created_at] from [logins] where [users].[name] = ? and [user_id] = [users].[id] order by (SELECT 0)) asc offset 10 rows fetch next 10 rows only', $builder->toSql());
         $this->assertEquals(['emailBinding', 'nameBinding'], $builder->getBindings());
 
         $builder = $this->getSqlServerBuilder();