Merge 484c47a into 6225f42

docs/source/NEWS.rst

@@ -16,6 +16,16 @@ Features
   as it may create *very* variable conditions in terms of loading and timing. An additional index is		
   also added to facilitate bi-directional movement between versions. Additional Unit test for GFS also added.
 
+API Changes
+^^^^^^^^^^^
+
+- ``Database.command()`` now takes ``codec_options`` argument.
+
+Bugfixes
+^^^^^^^^
+
+- ``GridFS.get_last_version()`` was creating redundant index
+
 Release 16.2.0 (2016-10-02)
 ---------------------------
 

tests/test_objects.py

@@ -20,7 +20,7 @@
 from io import BytesIO as StringIO
 
 import os
-from bson import objectid, timestamp
+from bson import objectid, timestamp, SON
 from pymongo.write_concern import WriteConcern
 import txmongo
 from txmongo import database, collection, filter as qf
@@ -371,4 +371,12 @@ def test_GridFsIndexesCreation(self):
 
         yield gfs.indexes_created()
 
+        indexes = yield db.fs.files.index_information()
+        self.assertTrue(any(key["key"] == SON([("filename", 1), ("uploadDate", 1)])
+                            for key in indexes.values()))
+
+        indexes = yield db.fs.chunks.index_information()
+        self.assertTrue(any(key["key"] == SON([("files_id", 1), ("n", 1)])
+                            for key in indexes.values()))
+
         yield conn.disconnect()

txmongo/_gridfs/__init__.py

@@ -61,7 +61,7 @@ def __init__(self, database, collection="fs"):
         self.__chunks = self.__collection.chunks
         self.__indexes_created_defer = defer.DeferredList([
             self.__files.create_index(
-                filter.sort(ASCENDING("filesname") + ASCENDING("uploadDate"))),
+                filter.sort(ASCENDING("filename") + ASCENDING("uploadDate"))),
             self.__chunks.create_index(
                 filter.sort(ASCENDING("files_id") + ASCENDING("n")), unique=True)
         ])
@@ -193,8 +193,6 @@ def get_last_version(self, filename):
 
         .. versionadded:: 1.6
         """
-        self.__files.ensure_index(filter.sort(ASCENDING("filename") + DESCENDING("uploadDate")))
-
         doc = yield self.__files.find_one({"filename": filename},
                                           filter=filter.sort(DESCENDING("uploadDate")))
         if doc is None:

txmongo/collection.py

@@ -9,6 +9,7 @@
 from bson import BSON, ObjectId
 from bson.code import Code
 from bson.son import SON
+from bson.codec_options import CodecOptions
 from pymongo.bulk import _Bulk, _COMMANDS, _merge_command
 from pymongo.errors import InvalidName, BulkWriteError, InvalidOperation, OperationFailure
 from pymongo.helpers import _check_write_command_response
@@ -971,7 +972,9 @@ def drop_indexes(self, **kwargs):
 
     @defer.inlineCallbacks
     def __index_information_3_0(self):
-        indexes_info = yield self._database.command("listIndexes", self.name)
+        codec = CodecOptions(document_class=SON)
+        indexes_info = yield self._database.command("listIndexes", self.name,
+                                                    codec_options=codec)
         assert indexes_info["cursor"]["id"] == 0
         defer.returnValue(indexes_info["cursor"]["firstBatch"])
 
@@ -981,7 +984,8 @@ def index_information(self, **kwargs):
         try:
             raw = yield self.__index_information_3_0()
         except OperationFailure:
-            raw = yield self._database.system.indexes.find({"ns": str(self)}, **kwargs)
+            raw = yield self._database.system.indexes.find({"ns": str(self)},
+                                                           as_class=SON, **kwargs)
 
         info = {}
         for idx in raw:

txmongo/database.py

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 from bson.son import SON
+from bson.codec_options import DEFAULT_CODEC_OPTIONS
 from pymongo.helpers import _check_command_response
 from twisted.internet import defer
 from twisted.python.compat import unicode
@@ -54,14 +55,15 @@ def codec_options(self):
 
     @timeout
     @defer.inlineCallbacks
-    def command(self, command, value=1, check=True, allowable_errors=None, **kwargs):
+    def command(self, command, value=1, check=True, allowable_errors=None,
+                codec_options=DEFAULT_CODEC_OPTIONS, **kwargs):
         if isinstance(command, (bytes, unicode)):
             command = SON([(command, value)])
         options = kwargs.copy()
         options.pop("_deadline", None)
         command.update(options)
 
-        ns = self["$cmd"]
+        ns = self["$cmd"].with_options(codec_options=codec_options)
         response = yield ns.find_one(command, **kwargs)
 
         if check: