Merge branch 'master' into develop

Author: jenssegers

.travis.yml

@@ -4,6 +4,7 @@ branches:
   only:
     - master
     - develop
+    - 4.0
 
 php:
   - 5.3

README.md

@@ -359,6 +359,49 @@ The belongsToMany relation will not use a pivot "table", but will push id's to a
 
 Other relations are not yet supported, but may be added in the future. Read more about these relations on http://four.laravel.com/docs/eloquent#relationships
 
+### EmbedsMany Relations
+
+If you want to embed documents, rather than referencing them, you can use the `embedsMany` relation:
+
+    use Jenssegers\Mongodb\Model as Eloquent;
+
+    class User extends Eloquent {
+
+        public function books()
+        {
+            return $this->embedsMany('Book');
+        }
+
+    }
+
+Now we can access the user's books through the dynamic property:
+
+    $books = User::first()->books;
+
+When using embedded documents, there will also be an inverse relation available:
+
+    $user = $book->user;
+
+Inserting and updating embedded documents works just like the `belongsTo` relation:
+
+    $book = new Book(array('title' => 'A Game of Thrones'));
+
+    $user = User::first();
+
+    $book = $user->books()->save($book);
+
+You can remove an embedded document by using the `destroy()` method:
+
+    $book = $user->books()->first();
+
+    $user->books()->destroy($book->_id);
+    // or
+    $user->books()->destroy($book);
+
+Again, you may override the conventional local key by passing a second argument to the embedsMany method:
+
+    return $this->embedsMany('Book', 'local_key');
+
 ### MySQL Relations
 
 If you're using a hybrid MongoDB and SQL setup, you're in luck! The model will automatically return a MongoDB- or SQL-relation based on the type of the related model. Of course, if you want this functionality to work both ways, your SQL-models will need to extend `Jenssegers\Eloquent\Model`. Note that this functionality only works for hasOne, hasMany and belongsTo relations.

phpunit.xml

@@ -34,6 +34,9 @@
         </testsuite>
         <testsuite name="relations">
             <directory>tests/RelationsTest.php</directory>
+        </testsuite>
+        <testsuite name="mysqlrelations">
+            <directory>tests/RelationsTest.php</directory>
             <directory>tests/MysqlRelationsTest.php</directory>
         </testsuite>
     </testsuites>

src/Jenssegers/Eloquent/Model.php

@@ -2,6 +2,9 @@
 
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Jenssegers\Mongodb\Relations\BelongsTo;
 use Jenssegers\Mongodb\Relations\BelongsToMany;
 use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
@@ -33,6 +36,35 @@ public function hasOne($related, $foreignKey = null, $localKey = null)
         return new HasOne($instance->newQuery(), $this, $foreignKey, $localKey);
     }
 
+    /**
+     * Define a polymorphic one-to-one relationship.
+     *
+     * @param  string  $related
+     * @param  string  $name
+     * @param  string  $type
+     * @param  string  $id
+     * @param  string  $localKey
+     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+     */
+    public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
+    {
+        // Check if it is a relation with an original model.
+        if (!is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        {
+            return parent::morphOne($related, $name, $type, $id, $localKey );
+        }
+
+        $instance = new $related;
+
+        list($type, $id) = $this->getMorphs($name, $type, $id);
+
+        $table = $instance->getTable();
+
+        $localKey = $localKey ?: $this->getKeyName();
+
+        return new MorphOne($instance->newQuery(), $this, $type, $id, $localKey);
+    }
+
     /**
     * Define a one-to-many relationship.
     *
@@ -58,6 +90,38 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
         return new HasMany($instance->newQuery(), $this, $foreignKey, $localKey);
     }
 
+    /**
+     * Define a polymorphic one-to-many relationship.
+     *
+     * @param  string  $related
+     * @param  string  $name
+     * @param  string  $type
+     * @param  string  $id
+     * @param  string  $localKey
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
+    {
+        // Check if it is a relation with an original model.
+        if (!is_subclass_of($related, 'Jenssegers\Mongodb\Model'))
+        {
+            return parent::morphMany($related, $name, $type, $id, $localKey);
+        }
+
+        $instance = new $related;
+
+        // Here we will gather up the morph type and ID for the relationship so that we
+        // can properly query the intermediate table of a relation. Finally, we will
+        // get the table and create the relationship instances for the developers.
+        list($type, $id) = $this->getMorphs($name, $type, $id);
+
+        $table = $instance->getTable();
+
+        $localKey = $localKey ?: $this->getKeyName();
+
+        return new MorphMany($instance->newQuery(), $this, $type, $id, $localKey);
+    }
+
     /**
     * Define an inverse one-to-one or many relationship.
     *
@@ -128,9 +192,7 @@ public function belongsToMany($related, $collection = null, $foreignKey = null,
         // title of this relation since that is a great convention to apply.
         if (is_null($relation))
         {
-            $caller = $this->getBelongsToManyCaller();
-
-            $name = $caller['function'];
+            $relation = $this->getBelongsToManyCaller();
         }
 
         // First, we'll need to determine the foreign key and "other key" for the

src/Jenssegers/Mongodb/Model.php

@@ -1,14 +1,10 @@
 <?php namespace Jenssegers\Mongodb;
 
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
 use Jenssegers\Mongodb\DatabaseManager as Resolver;
 use Jenssegers\Mongodb\Eloquent\Builder;
 use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
-use Jenssegers\Mongodb\Relations\BelongsTo;
-use Jenssegers\Mongodb\Relations\BelongsToMany;
+use Jenssegers\Mongodb\Relations\EmbedsMany;
 
 use Carbon\Carbon;
 use DateTime;
@@ -48,7 +44,44 @@ public function getIdAttribute($value)
         // If there is an actual id attribute, then return that.
         if ($value) return $value;
 
-        return $this->getKey();
+        // Return primary key value if present
+        if (array_key_exists($this->getKeyName(), $this->attributes)) return $this->attributes[$this->getKeyName()];
+    }
+
+    /**
+     * Define an embedded one-to-many relationship.
+     *
+     * @param  string  $related
+     * @param  string  $collection
+     * @return \Illuminate\Database\Eloquent\Relations\EmbedsMany
+     */
+    protected function embedsMany($related, $localKey = null, $foreignKey = null, $relation = null)
+    {
+        if (is_null($localKey))
+        {
+            $localKey = snake_case(str_plural($related)) . '_ids';
+        }
+
+        if (is_null($foreignKey))
+        {
+            $foreignKey = snake_case(class_basename($this));
+        }
+
+        // If no relation name was given, we will use this debug backtrace to extract
+        // the calling method's name and use that as the relationship name as most
+        // of the time this will be what we desire to use for the relatinoships.
+        if (is_null($relation))
+        {
+            list(, $caller) = debug_backtrace(false);
+
+            $relation = $caller['function'];
+        }
+
+        $query = $this->newQuery();
+
+        $instance = new $related;
+
+        return new EmbedsMany($query, $this, $instance, $localKey, $foreignKey, $relation);
     }
 
     /**
@@ -204,6 +237,23 @@ public function dropColumn($columns)
         return $query = $this->newQuery()->where($this->getKeyName(), $this->getKey())->unset($columns);
     }
 
+    /**
+     * Pass push to the query builder.
+     *
+     * @return mixed
+     */
+    public function push()
+    {
+        if ($parameters = func_get_args())
+        {
+            $query = $this->newQuery();
+
+            return call_user_func_array(array($query, 'push'), $parameters);
+        }
+
+        return parent::push();
+    }
+
     /**
      * Create a new Eloquent query builder for the model.
      *

src/Jenssegers/Mongodb/Query/Builder.php

@@ -6,6 +6,7 @@
 use DateTime;
 use Closure;
 
+use Illuminate\Database\Query\Expression;
 use Jenssegers\Mongodb\Connection;
 
 class Builder extends \Illuminate\Database\Query\Builder {
@@ -507,11 +508,19 @@ public function truncate()
      */
     public function raw($expression = null)
     {
+        // Execute the closure on the mongodb collection
         if ($expression instanceof Closure)
         {
             return call_user_func($expression, $this->collection);
         }
 
+        // Create an expression for the given value
+        else if (!is_null($expression))
+        {
+            return new Expression($expression);
+        }
+
+        // Quick access to the mongodb collection
         return $this->collection;
     }
 
@@ -631,7 +640,7 @@ protected function performUpdate($query, array $options = array())
      * @param  mixed $id
      * @return mixed
      */
-    protected function convertKey($id)
+    public function convertKey($id)
     {
         if (is_string($id) && strlen($id) === 24 && ctype_xdigit($id))
         {