Now using v4.0.x packages

mongodb · Aug 18, 2013 · 5493b6b · 5493b6b
1 parent 3827a51
commit 5493b6b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ Everything else works just like the original Eloquent model. Read more about the
 Query Builder
 -------------
 
-Once selected a mongodb connection, you can execute queries just like the original query builder. The main difference is that we are using `collection` instead of `table` (but table will work as well), and some additional operations like `push` and `pull`.
+Once you have selected a mongodb connection, you can execute queries just like the original query builder. The main difference is that we are using `collection` instead of `table` (but table will work as well), and some additional operations like `push` and `pull`.
 
     // With custom connection
     $user = DB::connection('mongodb')->collection('users')->get();

diff --git a/composer.json b/composer.json
@@ -11,12 +11,12 @@
     "license" : "MIT",
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "~4.0",
-        "illuminate/database": "~4.0",
-        "illuminate/events": "~4.0"
+        "illuminate/support": "4.0.x",
+        "illuminate/database": "4.0.x",
+        "illuminate/events": "4.0.x"
     },
     "require-dev": {
-        "illuminate/cache": "~4.0"
+        "illuminate/cache": "4.0.x"
     },
     "autoload": {
         "psr-0": {

diff --git a/src/Jenssegers/Mongodb/Builder.php b/src/Jenssegers/Mongodb/Builder.php
@@ -11,7 +11,7 @@ class Builder extends \Illuminate\Database\Query\Builder {
     *
     * @var MongoCollection
     */
-    public $collection;
+    protected $collection;
 
     /**
     * All of the available operators.
@@ -495,7 +495,7 @@ protected function performUpdate($query)
     *
     * @return array
     */
-    private function compileWheres()
+    protected function compileWheres()
     {
         if (!$this->wheres) return array();
 
@@ -507,13 +507,15 @@ private function compileWheres()
             // Convert id's
             if (isset($where['column']) && $where['column'] == '_id')
             {
+                // Multiple values
                 if (isset($where['values']))
                 {
                     foreach ($where['values'] as &$value)
                     {
                         $value = ($value instanceof MongoID) ? $value : new MongoID($value);
                     }
                 }
+                // Single value
                 else
                 {
                     $where['value'] = ($where['value'] instanceof MongoID) ? $where['value'] : new MongoID($where['value']);
@@ -544,7 +546,7 @@ private function compileWheres()
         return $wheres;
     }
 
-    private function compileWhereBasic($where)
+    protected function compileWhereBasic($where)
     {
         extract($where);
 
@@ -573,44 +575,44 @@ private function compileWhereBasic($where)
         return $query;
     }
 
-    private function compileWhereNested($where)
+    protected function compileWhereNested($where)
     {
         extract($where);
 
         return $query->compileWheres();
     }
 
-    private function compileWhereIn($where)
+    protected function compileWhereIn($where)
     {
         extract($where);
 
         return array($column => array('$in' => $values));
     }
 
-    private function compileWhereNotIn($where)
+    protected function compileWhereNotIn($where)
     {
         extract($where);
 
         return array($column => array('$nin' => $values));
     }
 
-    private function compileWhereNull($where)
+    protected function compileWhereNull($where)
     {
         $where['operator'] = '=';
         $where['value'] = null;
 
         return $this->compileWhereBasic($where);
     }
 
-    private function compileWhereNotNull($where)
+    protected function compileWhereNotNull($where)
     {
         $where['operator'] = '!=';
         $where['value'] = null;
 
         return $this->compileWhereBasic($where);
     }
 
-    private function compileWhereBetween($where)
+    protected function compileWhereBetween($where)
     {
         extract($where);
 
@@ -621,7 +623,7 @@ private function compileWhereBetween($where)
             );
     }
 
-    private function compileWhereRaw($where)
+    protected function compileWhereRaw($where)
     {
         return $where['sql'];
     }

diff --git a/src/Jenssegers/Mongodb/Relations/BelongsTo.php b/src/Jenssegers/Mongodb/Relations/BelongsTo.php
@@ -9,12 +9,15 @@ class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo {
 	 */
 	public function addConstraints()
 	{
-		// 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();
+		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();
 
-		$this->query->where($key, '=', $this->parent->{$this->foreignKey});
+			$this->query->where($key, '=', $this->parent->{$this->foreignKey});
+		}
 	}
 
 	/**