Merge branch 'develop'

Author: jenssegers

composer.json

@@ -11,13 +11,13 @@
     "license" : "MIT",
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.0.x",
-        "illuminate/database": "4.0.x",
-        "illuminate/events": "4.0.x"
+        "illuminate/support": "4.1.x",
+        "illuminate/database": "4.1.x",
+        "illuminate/events": "4.1.x"
     },
     "require-dev": {
-        "illuminate/cache": "4.0.x",
-        "illuminate/auth": "4.0.x"
+        "illuminate/cache": "4.1.x",
+        "illuminate/auth": "4.1.x"
     },
     "autoload": {
         "psr-0": {

src/Jenssegers/Mongodb/Model.php

@@ -204,14 +204,23 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
      * Define a many-to-many relationship.
      *
      * @param  string  $related
-     * @param  string  $table
+     * @param  string  $collection
      * @param  string  $foreignKey
      * @param  string  $otherKey
+     * @param  string  $relation
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function belongsToMany($related, $collection = null, $foreignKey = null, $otherKey = null)
+    public function belongsToMany($related, $collection = null, $foreignKey = null, $otherKey = null, $relation = null)
     {
-        $caller = $this->getBelongsToManyCaller();
+        // If no relationship name was passed, we will pull backtraces to get the
+        // name of the calling function. We will use that function name as the
+        // title of this relation since that is a great convention to apply.
+        if (is_null($relation))
+        {
+            $caller = $this->getBelongsToManyCaller();
+
+            $name = $caller['function'];
+        }
 
         // First, we'll need to determine the foreign key and "other key" for the
         // relationship. Once we have determined the keys we'll make the query
@@ -235,7 +244,7 @@ public function belongsToMany($related, $collection = null, $foreignKey = null,
         // appropriate query constraint and entirely manages the hydrations.
         $query = $instance->newQuery();
 
-        return new BelongsToMany($query, $this, $collection, $foreignKey, $otherKey, $caller['function']);
+        return new BelongsToMany($query, $this, $collection, $foreignKey, $otherKey, $relation);
     }
 
     /**

src/Jenssegers/Mongodb/Relations/BelongsTo.php

@@ -3,20 +3,20 @@
 class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo {
 
 	/**
-	 * Set the base constraints on the relation query.
-	 *
-	 * @return void
-	 */
+	* Set the base constraints on the relation query.
+	*
+	* @return void
+	*/
 	public function addConstraints()
 	{
 		if (static::$constraints)
 		{
 			// For belongs to relationships, which are essentially the inverse of has one
 			// or has many relationships, we need to actually query on the primary key
 			// of the related models matching on the foreign key that's on a parent.
-			$key = $this->related->getKeyName();
+			$table = $this->related->getTable();
 
-			$this->query->where($key, '=', $this->parent->{$this->foreignKey});
+			$this->query->where($this->otherKey, '=', $this->parent->{$this->foreignKey});
 		}
 	}
 
@@ -31,9 +31,9 @@ public function addEagerConstraints(array $models)
 		// We'll grab the primary key name of the related models since it could be set to
 		// a non-standard name and not "id". We will then construct the constraint for
 		// our eagerly loading query so it returns the proper models from execution.
-		$key = $this->related->getKeyName();
+		$key = $this->otherKey;
 
 		$this->query->whereIn($key, $this->getEagerModelKeys($models));
 	}
 
-}
+}

tests/QueryBuilderTest.php

@@ -265,10 +265,10 @@ public function testDistinct()
 		));
 
 		$items = DB::collection('items')->distinct('name')->get();
-		$this->assertEquals(array('knife', 'fork', 'spoon'), $items);
+		$this->assertEquals(3, count($items));
 
 		$types = DB::collection('items')->distinct('type')->get();
-		$this->assertEquals(array('sharp', 'round'), $types);
+		$this->assertEquals(2, count($types));
 	}
 
 	public function testCustomId()