Tweaking id accessor for #108

Author: jenssegers

src/Jenssegers/Mongodb/Model.php

@@ -48,7 +48,7 @@ public function getIdAttribute($value)
         // If there is an actual id attribute, then return that.
         if ($value) return $value;
 
-        return $this->getKey();
+        return $this->attributes[$this->getKeyName()];
     }
 
     /**

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;
     }