Skip to content

Commit fa36390

Browse files
committed
Added tests and fixed broken build
1 parent 318d003 commit fa36390

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

src/Jenssegers/Eloquent/Model.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,4 @@ protected function newBaseQueryBuilder()
176176
return parent::newBaseQueryBuilder();
177177
}
178178

179-
/**
180-
* Create a new Eloquent query builder for the model.
181-
*
182-
* @param \Jenssegers\Mongodb\Query\Builder $query
183-
* @return \Jenssegers\Mongodb\Eloquent\Builder|static
184-
*/
185-
public function newEloquentBuilder($query)
186-
{
187-
return new Builder($query);
188-
}
189-
190179
}

src/Jenssegers/Eloquent/Builder.php renamed to src/Jenssegers/Mongodb/Eloquent/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php namespace Jenssegers\Eloquent;
1+
<?php namespace Jenssegers\Mongodb\Eloquent;
22

33
class Builder extends \Illuminate\Database\Eloquent\Builder {
44

@@ -12,4 +12,4 @@ class Builder extends \Illuminate\Database\Eloquent\Builder {
1212
'count', 'min', 'max', 'avg', 'sum', 'exists', 'push', 'pull'
1313
);
1414

15-
}
15+
}

src/Jenssegers/Mongodb/Model.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Database\Eloquent\Relations\HasMany;
66

77
use Jenssegers\Mongodb\DatabaseManager as Resolver;
8+
use Jenssegers\Mongodb\Eloquent\Builder;
89
use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
910
use Jenssegers\Mongodb\Relations\BelongsTo;
1011
use Jenssegers\Mongodb\Relations\BelongsToMany;
@@ -203,6 +204,17 @@ public function dropColumn($columns)
203204
return $query = $this->newQuery()->where($this->getKeyName(), $this->getKey())->unset($columns);
204205
}
205206

207+
/**
208+
* Create a new Eloquent query builder for the model.
209+
*
210+
* @param \Jenssegers\Mongodb\Query\Builder $query
211+
* @return \Jenssegers\Mongodb\Eloquent\Builder|static
212+
*/
213+
public function newEloquentBuilder($query)
214+
{
215+
return new Builder($query);
216+
}
217+
206218
/**
207219
* Handle dynamic method calls into the method.
208220
*

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ public function attach($id, array $attributes = array(), $touch = true)
130130
$foreignIds = array_pluck($records, $this->foreignKey);
131131

132132
// Attach to the parent model
133-
$parent->push($this->otherKey, $otherIds[0])->update(array());
133+
$parent->push($this->otherKey, $otherIds[0]);
134134

135135
// Attach to the related model
136-
$related->push($this->foreignKey, $foreignIds[0])->update(array());
136+
$related->push($this->foreignKey, $foreignIds[0]);
137137
}
138138

139139
/**
@@ -192,7 +192,7 @@ public function detach($ids = array(), $touch = true)
192192
{
193193
$query->pull($this->otherKey, $id);
194194
}
195-
195+
196196
// Remove the relation from the related model
197197
$related->pull($this->foreignKey, $this->parent->getKey());
198198

tests/ModelTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,4 +332,16 @@ public function testIdAttribute()
332332
$this->assertNotEquals($user->id, $user->_id);
333333
}
334334

335+
public function testPushPull()
336+
{
337+
$user = User::create(array('name' => 'John Doe', 'tags' => array()));
338+
339+
$result = User::where('_id', $user->_id)->push('tags', 'tag1');
340+
$user = User::where('_id', $user->_id)->first();
341+
342+
#$this->assertTrue(is_int($result));
343+
$this->assertTrue(is_array($user->tags));
344+
$this->assertEquals(1, count($user->tags));
345+
}
346+
335347
}

0 commit comments

Comments
 (0)