Merge branch 'master' of github.com:jenssegers/laravel-mongodb

Author: AAllport

src/Jenssegers/Mongodb/Eloquent/Builder.php

@@ -44,7 +44,7 @@ public function update(array $values, array $options = [])
             return 1;
         }
 
-        return $this->query->update($this->addUpdatedAtColumn($values), $options);
+        return $this->toBase()->update($this->addUpdatedAtColumn($values), $options);
     }
 
     /**

src/Jenssegers/Mongodb/Query/Builder.php

@@ -204,6 +204,16 @@ public function find($id, $columns = [])
         return $this->where('_id', '=', $this->convertKey($id))->first($columns);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function value($column)
+    {
+        $result = (array) $this->first([$column]);
+
+        return Arr::get($result, $column);
+    }
+
     /**
      * @inheritdoc
      */

tests/QueryBuilderTest.php

@@ -701,4 +701,16 @@ public function testProjections()
             $this->assertEquals(1, count($result['tags']));
         }
     }
+
+    public function testValue()
+    {
+        DB::collection('books')->insert([
+            ['title' => 'Moby-Dick', 'author' => ['first_name' => 'Herman', 'last_name' => 'Melville']]
+        ]);
+
+        $this->assertEquals('Moby-Dick', DB::collection('books')->value('title'));
+        $this->assertEquals(['first_name' => 'Herman', 'last_name' => 'Melville'], DB::collection('books')->value('author'));
+        $this->assertEquals('Herman', DB::collection('books')->value('author.first_name'));
+        $this->assertEquals('Melville', DB::collection('books')->value('author.last_name'));
+    }
 }

tests/QueryTest.php

@@ -21,6 +21,7 @@ public function setUp(): void
     public function tearDown(): void
     {
         User::truncate();
+        Scoped::truncate();
         parent::tearDown();
     }
 
@@ -309,4 +310,21 @@ public function testPaginate()
         $this->assertEquals(9, $results->total());
         $this->assertEquals(1, $results->currentPage());
     }
+
+    public function testUpdate()
+    {
+        $this->assertEquals(1, User::where(['name' => 'John Doe'])->update(['name' => 'Jim Morrison']));
+        $this->assertEquals(1, User::where(['name' => 'Jim Morrison'])->count());
+
+        Scoped::create(['favorite' => true]);
+        Scoped::create(['favorite' => false]);
+
+        $this->assertCount(1, Scoped::get());
+        $this->assertEquals(1, Scoped::query()->update(['name' => 'Johnny']));
+        $this->assertCount(1, Scoped::withoutGlobalScopes()->where(['name' => 'Johnny'])->get());
+
+        $this->assertCount(2, Scoped::withoutGlobalScopes()->get());
+        $this->assertEquals(2, Scoped::withoutGlobalScopes()->update(['name' => 'Jimmy']));
+        $this->assertCount(2, Scoped::withoutGlobalScopes()->where(['name' => 'Jimmy'])->get());
+    }
 }

tests/models/Scoped.php

@@ -0,0 +1,20 @@
+<?php
+
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\Builder;
+
+class Scoped extends Eloquent
+{
+    protected $connection = 'mongodb';
+    protected $collection = 'scoped';
+    protected $fillable = ['name', 'favorite'];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('favorite', function (Builder $builder) {
+            $builder->where('favorite', true);
+        });
+    }
+}