Merge pull request #33496 from rodrigopedra/6.x

[6.x] revert PR #33453 (backport of #33430)

Author: driesvints

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

@@ -305,19 +305,6 @@ public function compileExists(Builder $query)
         return $this->compileSelect($existsQuery->selectRaw('1 [exists]')->limit(1));
     }
 
-    /**
-     * Compile an insert and get ID statement into SQL.
-     *
-     * @param  \Illuminate\Database\Query\Builder  $query
-     * @param  array  $values
-     * @param  string  $sequence
-     * @return string
-     */
-    public function compileInsertGetId(Builder $query, $values, $sequence)
-    {
-        return 'set nocount on;'.$this->compileInsert($query, $values).';select scope_identity() as '.$this->wrap($sequence ?: 'id');
-    }
-
     /**
      * Compile an update statement with joins into SQL.
      *

src/Illuminate/Database/Query/Processors/SqlServerProcessor.php

@@ -2,6 +2,8 @@
 
 namespace Illuminate\Database\Query\Processors;
 
+use Exception;
+use Illuminate\Database\Connection;
 use Illuminate\Database\Query\Builder;
 
 class SqlServerProcessor extends Processor
@@ -19,15 +21,38 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu
     {
         $connection = $query->getConnection();
 
-        $connection->recordsHaveBeenModified();
+        $connection->insert($sql, $values);
 
-        $result = $connection->selectFromWriteConnection($sql, $values)[0];
+        if ($connection->getConfig('odbc') === true) {
+            $id = $this->processInsertGetIdForOdbc($connection);
+        } else {
+            $id = $connection->getPdo()->lastInsertId();
+        }
 
-        $sequence = $sequence ?: 'id';
+        return is_numeric($id) ? (int) $id : $id;
+    }
 
-        $id = is_object($result) ? $result->{$sequence} : $result[$sequence];
+    /**
+     * Process an "insert get ID" query for ODBC.
+     *
+     * @param  \Illuminate\Database\Connection  $connection
+     * @return int
+     *
+     * @throws \Exception
+     */
+    protected function processInsertGetIdForOdbc(Connection $connection)
+    {
+        $result = $connection->selectFromWriteConnection(
+            'SELECT CAST(COALESCE(SCOPE_IDENTITY(), @@IDENTITY) AS int) AS insertid'
+        );
 
-        return is_numeric($id) ? (int) $id : $id;
+        if (! $result) {
+            throw new Exception('Unable to retrieve lastInsertID for ODBC.');
+        }
+
+        $row = $result[0];
+
+        return is_object($row) ? $row->insertid : $row['insertid'];
     }
 
     /**

tests/Database/DatabaseQueryBuilderTest.php

@@ -2071,7 +2071,7 @@ public function testInsertGetIdWithEmptyValues()
         $builder->from('users')->insertGetId([]);
 
         $builder = $this->getSqlServerBuilder();
-        $builder->getProcessor()->shouldReceive('processInsertGetId')->once()->with($builder, 'set nocount on;insert into [users] default values;select scope_identity() as [id]', [], null);
+        $builder->getProcessor()->shouldReceive('processInsertGetId')->once()->with($builder, 'insert into [users] default values', [], null);
         $builder->from('users')->insertGetId([]);
     }
 
@@ -2410,14 +2410,6 @@ public function testPostgresInsertGetId()
         $this->assertEquals(1, $result);
     }
 
-    public function testSqlServerInsertGetId()
-    {
-        $builder = $this->getSqlServerBuilder();
-        $builder->getProcessor()->shouldReceive('processInsertGetId')->once()->with($builder, 'set nocount on;insert into [users] ([email]) values (?);select scope_identity() as [id]', ['foo'], 'id')->andReturn(1);
-        $result = $builder->from('users')->insertGetId(['email' => 'foo'], 'id');
-        $this->assertEquals(1, $result);
-    }
-
     public function testMySqlWrapping()
     {
         $builder = $this->getMySqlBuilder();