[8.x] Add missing fix to DatabaseRule::resolveTableName fix #37580 (#…

…37621) * add missing fix to DatabaseRule::resolveTableName * style CI fixes
laravel · Jun 8, 2021 · 5a085e9 · 5a085e9
1 parent b4cfbd5
commit 5a085e9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/src/Illuminate/Validation/Rules/DatabaseRule.php b/src/Illuminate/Validation/Rules/DatabaseRule.php
@@ -65,6 +65,10 @@ public function resolveTableName($table)
         if (is_subclass_of($table, Model::class)) {
             $model = new $table;
 
+            if (Str::contains($model->getTable(), '.')) {
+                return $table;
+            }
+
             return implode('.', array_map(function (string $part) {
                 return trim($part, '.');
             }, array_filter([$model->getConnectionName(), $model->getTable()])));

diff --git a/tests/Validation/ValidationExistsRuleTest.php b/tests/Validation/ValidationExistsRuleTest.php
@@ -43,6 +43,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule->where('foo', 'bar');
         $this->assertSame('exists:users,NULL,foo,"bar"', (string) $rule);
 
+        $rule = new Exists(UserWithPrefixedTable::class);
+        $rule->where('foo', 'bar');
+        $this->assertSame('exists:'.UserWithPrefixedTable::class.',NULL,foo,"bar"', (string) $rule);
+
         $rule = new Exists('table', 'column');
         $rule->where('foo', 'bar');
         $this->assertSame('exists:table,column,foo,"bar"', (string) $rule);
@@ -235,6 +239,13 @@ class User extends Eloquent
     public $timestamps = false;
 }
 
+class UserWithPrefixedTable extends Eloquent
+{
+    protected $table = 'public.users';
+    protected $guarded = [];
+    public $timestamps = false;
+}
+
 class UserWithConnection extends User
 {
     protected $connection = 'mysql';

diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php
@@ -35,6 +35,9 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule->where('foo', 'bar');
         $this->assertSame('unique:table,column,"Taylor, Otwell",id_column,foo,"bar"', (string) $rule);
 
+        $rule = new Unique(PrefixedTableEloquentModelStub::class);
+        $this->assertSame('unique:'.PrefixedTableEloquentModelStub::class.',NULL,NULL,id', (string) $rule);
+
         $rule = new Unique(EloquentModelStub::class, 'column');
         $rule->ignore('Taylor, Otwell', 'id_column');
         $rule->where('foo', 'bar');
@@ -87,6 +90,13 @@ class EloquentModelStub extends Model
     protected $guarded = [];
 }
 
+class PrefixedTableEloquentModelStub extends Model
+{
+    protected $table = 'public.table';
+    protected $primaryKey = 'id_column';
+    protected $guarded = [];
+}
+
 class NoTableName extends Model
 {
     protected $guarded = [];