PHPORM-243 Alias _id to id in Schema::getColumns

mongodb · Sep 20, 2024 · 844da1b · 844da1b
1 parent b51aeff
commit 844da1b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/Schema/Builder.php b/src/Schema/Builder.php
@@ -9,11 +9,13 @@
 use MongoDB\Model\IndexInfo;
 
 use function array_fill_keys;
+use function array_filter;
 use function array_keys;
 use function assert;
 use function count;
 use function current;
 use function implode;
+use function in_array;
 use function iterator_to_array;
 use function sort;
 use function sprintf;
@@ -40,6 +42,13 @@ public function hasColumn($table, $column): bool
      */
     public function hasColumns($table, array $columns): bool
     {
+        // The field "id" (alias of "_id") is required for all MongoDB documents
+        $columns = array_filter($columns, fn (string $column): bool => ! in_array($column, ['_id', 'id'], true));
+
+        if ($columns === []) {
+            return true;
+        }
+
         $collection = $this->connection->table($table);
 
         return $collection
@@ -187,16 +196,21 @@ public function getColumns($table)
         foreach ($stats as $stat) {
             sort($stat->types);
             $type = implode(', ', $stat->types);
+            $name = $stat->_id;
+            if ($name === '_id') {
+                $name = 'id';
+            }
+
             $columns[] = [
-                'name' => $stat->_id,
+                'name' => $name,
                 'type_name' => $type,
                 'type' => $type,
                 'collation' => null,
-                'nullable' => $stat->_id !== '_id',
+                'nullable' => $name !== 'id',
                 'default' => null,
                 'auto_increment' => false,
                 'comment' => sprintf('%d occurrences', $stat->total),
-                'generation' => $stat->_id === '_id' ? ['type' => 'objectId', 'expression' => null] : null,
+                'generation' => $name === 'id' ? ['type' => 'objectId', 'expression' => null] : null,
             ];
         }
 

diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -374,6 +374,9 @@ public function testRenameColumn(): void
 
     public function testHasColumn(): void
     {
+        $this->assertTrue(Schema::hasColumn('newcollection', '_id'));
+        $this->assertTrue(Schema::hasColumn('newcollection', 'id'));
+
         DB::connection()->table('newcollection')->insert(['column1' => 'value']);
 
         $this->assertTrue(Schema::hasColumn('newcollection', 'column1'));
@@ -382,6 +385,9 @@ public function testHasColumn(): void
 
     public function testHasColumns(): void
     {
+        $this->assertTrue(Schema::hasColumns('newcollection', ['_id']));
+        $this->assertTrue(Schema::hasColumns('newcollection', ['id']));
+
         // Insert documents with both column1 and column2
         DB::connection()->table('newcollection')->insert([
             ['column1' => 'value1', 'column2' => 'value2'],
@@ -451,8 +457,9 @@ public function testGetColumns()
             $this->assertIsString($column['comment']);
         });
 
-        $this->assertEquals('objectId', $columns->get('_id')['type']);
-        $this->assertEquals('objectId', $columns->get('_id')['generation']['type']);
+        $this->assertNull($columns->get('_id'), '_id is renamed to id');
+        $this->assertEquals('objectId', $columns->get('id')['type']);
+        $this->assertEquals('objectId', $columns->get('id')['generation']['type']);
         $this->assertNull($columns->get('text')['generation']);
         $this->assertEquals('string', $columns->get('text')['type']);
         $this->assertEquals('date', $columns->get('date')['type']);