Use wrapper for MongoCollection, fixes #209

src/Jenssegers/Mongodb/Collection.php

@@ -0,0 +1,68 @@
+<?php namespace Jenssegers\Mongodb;
+
+use Exception;
+use MongoCollection;
+use Jenssegers\Mongodb\Connection;
+
+class Collection {
+
+    /**
+     * The connection instance.
+     *
+     * @var Connection
+     */
+    protected $connection;
+
+    /**
+     * The MongoCollection instance..
+     *
+     * @var MongoCollection
+     */
+    protected $collection;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(Connection $connection, MongoCollection $collection)
+    {
+        $this->connection = $connection;
+        $this->collection = $collection;
+    }
+
+    /**
+     * Handle dynamic method calls.
+     *
+     * @param  string  $method
+     * @param  array   $parameters
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        // Build the query string.
+        $query = $parameters;
+        foreach ($query as &$param)
+        {
+            try
+            {
+                $param = json_encode($param);
+            }
+            catch (Exception $e)
+            {
+                $param = '{...}';
+            }
+        }
+
+        $start = microtime(true);
+
+        // Execute the query.
+        $result = call_user_func_array(array($this->collection, $method), $parameters);
+
+        // Log the query.
+        $this->connection->logQuery(
+            $this->collection->getName() . '.' . $method . '(' . join(',', $query) . ')',
+            array(), $this->connection->getElapsedTime($start));
+
+        return $result;
+    }
+
+}

src/Jenssegers/Mongodb/Connection.php

@@ -1,5 +1,6 @@
 <?php namespace Jenssegers\Mongodb;
 
+use Jenssegers\Mongodb\Collection;
 use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
 use MongoClient;
 
@@ -8,14 +9,14 @@ class Connection extends \Illuminate\Database\Connection {
     /**
      * The MongoDB database handler.
      *
-     * @var resource
+     * @var MongoDB
      */
     protected $db;
 
     /**
      * The MongoClient connection handler.
      *
-     * @var resource
+     * @var MongoClient
      */
     protected $connection;
 
@@ -74,7 +75,7 @@ public function table($table)
      */
     public function getCollection($name)
     {
-        return $this->db->{$name};
+        return new Collection($this, $this->db->selectCollection($name));
     }
 
     /**

src/Jenssegers/Mongodb/Query/Builder.php

@@ -79,8 +79,6 @@ public function find($id, $columns = array())
      */
     public function getFresh($columns = array())
     {
-        $start = microtime(true);
-
         // If no columns have been specified for the select statement, we will set them
         // here to either the passed columns, or the standard default of retrieving
         // all of the columns on the table using the "wildcard" column character.
@@ -161,11 +159,6 @@ public function getFresh($columns = array())
             // Execute aggregation
             $results = $this->collection->aggregate($pipeline);
 
-            // Log query
-            $this->connection->logQuery(
-                $this->from . '.aggregate(' . json_encode($pipeline) . ')',
-                array(), $this->connection->getElapsedTime($start));
-
             // Return results
             return $results['result'];
         }
@@ -179,11 +172,6 @@ public function getFresh($columns = array())
             // Execute distinct
             $result = $this->collection->distinct($column, $wheres);
 
-            // Log query
-            $this->connection->logQuery(
-                $this->from . '.distinct("' . $column . '", ' . json_encode($wheres) . ')',
-                array(), $this->connection->getElapsedTime($start));
-
             return $result;
         }
 
@@ -204,11 +192,6 @@ public function getFresh($columns = array())
             if ($this->offset) $cursor->skip($this->offset);
             if ($this->limit)  $cursor->limit($this->limit);
 
-            // Log query
-            $this->connection->logQuery(
-                $this->from . '.find(' . json_encode($wheres) . ', ' . json_encode($columns) . ')',
-                array(), $this->connection->getElapsedTime($start));
-
             // Return results as an array with numeric keys
             return iterator_to_array($cursor, false);
         }
@@ -327,8 +310,6 @@ public function whereBetween($column, array $values, $boolean = 'and', $not = fa
      */
     public function insert(array $values)
     {
-        $start = microtime(true);
-
         // Since every insert gets treated like a batch insert, we will have to detect
         // if the user is inserting a single document or an array of documents.
         $batch = true;
@@ -347,11 +328,6 @@ public function insert(array $values)
         // Batch insert
         $result = $this->collection->batchInsert($values);
 
-        // Log query
-        $this->connection->logQuery(
-            $this->from . '.batchInsert(' . json_encode($values) . ')',
-            array(), $this->connection->getElapsedTime($start));
-
         return (1 == (int) $result['ok']);
     }
 
@@ -364,15 +340,8 @@ public function insert(array $values)
      */
     public function insertGetId(array $values, $sequence = null)
     {
-        $start = microtime(true);
-
         $result = $this->collection->insert($values);
 
-        // Log query
-        $this->connection->logQuery(
-            $this->from . '.insert(' . json_encode($values) . ')',
-            array(), $this->connection->getElapsedTime($start));
-
         if (1 == (int) $result['ok'])
         {
             if (!$sequence)
@@ -467,16 +436,9 @@ public function pluck($column)
      */
     public function delete($id = null)
     {
-        $start = microtime(true);
-
         $wheres = $this->compileWheres();
         $result = $this->collection->remove($wheres);
 
-        // Log query
-        $this->connection->logQuery(
-            $this->from . '.remove(' . json_encode($wheres) . ')',
-            array(), $this->connection->getElapsedTime($start));
-
         if (1 == (int) $result['ok'])
         {
             return $result['n'];
@@ -623,8 +585,6 @@ public function newQuery()
      */
     protected function performUpdate($query, array $options = array())
     {
-        $start = microtime(true);
-
         // Default options
         $default = array('multiple' => true);
 
@@ -634,11 +594,6 @@ protected function performUpdate($query, array $options = array())
         $wheres = $this->compileWheres();
         $result = $this->collection->update($wheres, $query, $options);
 
-        // Log query
-        $this->connection->logQuery(
-            $this->from . '.update(' . json_encode($wheres) . ', ' . json_encode($query) . ', ' . json_encode($options) . ')',
-            array(), $this->connection->getElapsedTime($start));
-
         if (1 == (int) $result['ok'])
         {
             return $result['n'];

tests/ConnectionTest.php

@@ -31,7 +31,7 @@ public function testDb()
 	public function testCollection()
 	{
 		$collection = DB::connection('mongodb')->getCollection('unittest');
-		$this->assertInstanceOf('MongoCollection', $collection);
+		$this->assertInstanceOf('Jenssegers\Mongodb\Collection', $collection);
 
 		$collection = DB::connection('mongodb')->collection('unittests');
 		$this->assertInstanceOf('Jenssegers\Mongodb\Query\Builder', $collection);

tests/QueryBuilderTest.php

@@ -188,10 +188,10 @@ public function testRaw()
 		$this->assertEquals(1, $cursor->count());
 
 		$collection = DB::collection('users')->raw();
-		$this->assertInstanceOf('MongoCollection', $collection);
+		$this->assertInstanceOf('Jenssegers\Mongodb\Collection', $collection);
 
 		$collection = User::raw();
-		$this->assertInstanceOf('MongoCollection', $collection);
+		$this->assertInstanceOf('Jenssegers\Mongodb\Collection', $collection);
 
 		$results = DB::collection('users')->whereRaw(array('age' => 20))->get();
 		$this->assertEquals(1, count($results));