Merge branch '6.x' into 7.x

Author: driesvints

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

@@ -323,19 +323,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'];
     }
 
     /**

src/Illuminate/Validation/Rules/DatabaseRule.php

@@ -62,11 +62,11 @@ public function resolveTableName($table)
             return $table;
         }
 
-        $model = new $table;
+        if (is_subclass_of($table, Model::class)) {
+            return (new $table)->getTable();
+        }
 
-        return $model instanceof Model
-                ? $model->getTable()
-                : $table;
+        return $table;
     }
 
     /**

src/Illuminate/Validation/Validator.php

@@ -428,7 +428,8 @@ protected function shouldBeExcluded($attribute)
      */
     protected function removeAttribute($attribute)
     {
-        unset($this->data[$attribute], $this->rules[$attribute]);
+        Arr::forget($this->data, $attribute);
+        Arr::forget($this->rules, $attribute);
     }
 
     /**

tests/Database/DatabaseQueryBuilderTest.php

@@ -2130,7 +2130,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([]);
     }
 
@@ -2474,14 +2474,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();

tests/Validation/ValidationExistsRuleTest.php

@@ -58,6 +58,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule = new Exists(NoTableNameModel::class, 'column');
         $rule->where('foo', 'bar');
         $this->assertSame('exists:no_table_name_models,column,foo,"bar"', (string) $rule);
+
+        $rule = new Exists(ClassWithRequiredConstructorParameters::class, 'column');
+        $rule->where('foo', 'bar');
+        $this->assertSame('exists:'.ClassWithRequiredConstructorParameters::class.',column,foo,"bar"', (string) $rule);
     }
 
     public function testItChoosesValidRecordsUsingWhereInRule()
@@ -203,3 +207,15 @@ class NoTableNameModel extends Eloquent
     protected $guarded = [];
     public $timestamps = false;
 }
+
+class ClassWithRequiredConstructorParameters
+{
+    private $bar;
+    private $baz;
+
+    public function __construct($bar, $baz)
+    {
+        $this->bar = $bar;
+        $this->baz = $baz;
+    }
+}

tests/Validation/ValidationUniqueRuleTest.php

@@ -26,6 +26,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule->where('foo', 'bar');
         $this->assertSame('unique:no_table_names,NULL,NULL,id,foo,"bar"', (string) $rule);
 
+        $rule = new Unique(ClassWithNonEmptyConstructor::class);
+        $rule->where('foo', 'bar');
+        $this->assertSame('unique:'.ClassWithNonEmptyConstructor::class.',NULL,NULL,id,foo,"bar"', (string) $rule);
+
         $rule = new Unique('table', 'column');
         $rule->ignore('Taylor, Otwell', 'id_column');
         $rule->where('foo', 'bar');
@@ -78,3 +82,15 @@ class NoTableName extends Model
     protected $guarded = [];
     public $timestamps = false;
 }
+
+class ClassWithNonEmptyConstructor
+{
+    private $bar;
+    private $baz;
+
+    public function __construct($bar, $baz)
+    {
+        $this->bar = $bar;
+        $this->baz = $baz;
+    }
+}

tests/Validation/ValidationValidatorTest.php

@@ -5223,13 +5223,10 @@ public function providesPassingExcludeIfData()
                     'vehicles' => [
                         [
                             'type' => 'car', 'wheels' => [
-                                // The shape field for these blue wheels were correctly excluded (if they weren't, they would
-                                // fail the validation). They still appear in the validated data. This behaviour is unrelated
-                                // to the "exclude" type rules.
                                 ['color' => 'red', 'shape' => 'square'],
-                                ['color' => 'blue', 'shape' => 'hexagon'],
+                                ['color' => 'blue'],
                                 ['color' => 'red', 'shape' => 'round', 'junk' => 'no rule, still present'],
-                                ['color' => 'blue', 'shape' => 'triangle'],
+                                ['color' => 'blue'],
                             ],
                         ],
                         ['type' => 'boat'],