Refactor hasColumns method and test

mongodb · Jun 10, 2024 · ca0285f · ca0285f
1 parent 680433c
commit ca0285f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Schema/Builder.php b/src/Schema/Builder.php
@@ -39,12 +39,11 @@ public function hasColumn($table, $column): bool
      */
     public function hasColumns($table, array $columns): bool
     {
-        foreach ($columns as $column) {
-            if (!$this->hasColumn($table, $column)) {
-                return false;
-            }
-        }
-        return true;
+        $collection = $this->connection->table($table);
+
+        return $collection->whereAll($columns, 'exists', true)
+            ->project(['_id' => 1])
+            ->exists();
     }
 
     /**

diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -387,8 +387,10 @@ public function testHasColumn(): void
 
     public function testHasColumns(): void
     {
-        DB::connection()->collection('newcollection')->insert(['column1' => 'value']);
-        DB::connection()->collection('newcollection')->insert(['column2' => 'value']);
+        // Insert documents with both column1 and column2
+        DB::connection()->collection('newcollection')->insert([
+            ['column1' => 'value1', 'column2' => 'value2']
+        ]);
 
         $this->assertTrue(Schema::hasColumns('newcollection', ['column1', 'column2']));
         $this->assertFalse(Schema::hasColumns('newcollection', ['column1', 'column3']));