[10.x] Fix postgreSQL reserved word column names w/ guarded attribute…

…s broken in native column attributes implementation (#48877) * unquote quoted names on postgresql * add test * fix mysql 5.7 error * fix table prefixed twice * revert removing 'end' keyword
laravel · Nov 1, 2023 · a6db48e · a6db48e
1 parent 87b9e79
commit a6db48e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Query/Processors/PostgresProcessor.php b/src/Illuminate/Database/Query/Processors/PostgresProcessor.php
@@ -59,7 +59,7 @@ public function processColumns($results)
             $autoincrement = $result->default !== null && str_starts_with($result->default, 'nextval(');
 
             return [
-                'name' => $result->name,
+                'name' => str_starts_with($result->name, '"') ? str_replace('"', '', $result->name) : $result->name,
                 'type_name' => $result->type_name,
                 'type' => $result->type,
                 'collation' => $result->collation,

diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php
@@ -238,9 +238,9 @@ public function whenTableDoesntHaveColumn(string $table, string $column, Closure
      */
     public function getColumnType($table, $column, $fullDefinition = false)
     {
-        $table = $this->connection->getTablePrefix().$table;
-
         if (! $this->connection->usingNativeSchemaOperations()) {
+            $table = $this->connection->getTablePrefix().$table;
+
             return $this->connection->getDoctrineColumn($table, $column)->getType()->getName();
         }
 

diff --git a/tests/Integration/Database/EloquentModelTest.php b/tests/Integration/Database/EloquentModelTest.php
@@ -94,6 +94,38 @@ public function testDiscardChanges()
         $user->save();
         $this->assertFalse($user->wasChanged());
     }
+
+    public function testInsertRecordWithReservedWordFieldName()
+    {
+        Schema::create('actions', function (Blueprint $table) {
+            $table->id();
+            $table->string('label');
+            $table->timestamp('start');
+            $table->timestamp('end')->nullable();
+            $table->boolean('analyze');
+        });
+
+        $model = new class extends Model
+        {
+            protected $table = 'actions';
+            protected $guarded = ['id'];
+            public $timestamps = false;
+        };
+
+        $model->newInstance()->create([
+            'label' => 'test',
+            'start' => '2023-01-01 00:00:00',
+            'end' => '2024-01-01 00:00:00',
+            'analyze' => true,
+        ]);
+
+        $this->assertDatabaseHas('actions', [
+            'label' => 'test',
+            'start' => '2023-01-01 00:00:00',
+            'end' => '2024-01-01 00:00:00',
+            'analyze' => true,
+        ]);
+    }
 }
 
 class TestModel1 extends Model