From 8f6c5cdf2a6c263cd22f86d14496489e38349e3a Mon Sep 17 00:00:00 2001 From: "Michael S. Klishin" Date: Sun, 29 Jan 2012 07:56:13 +0400 Subject: [PATCH] Add explicit GridFS instance parameter to monger.gridfs/remove, /remove-all and /all-files Unfortunately, we cannot do the same for functions that implement GridFS-related protocols. --- src/monger/gridfs.clj | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/monger/gridfs.clj b/src/monger/gridfs.clj index 8385152..90d8a73 100644 --- a/src/monger/gridfs.clj +++ b/src/monger/gridfs.clj @@ -3,7 +3,7 @@ (:require [monger.core] [clojure.java.io :as io]) (:use [monger.conversion]) - (:import [com.mongodb DBObject] + (:import [com.mongodb DB DBObject] [com.mongodb.gridfs GridFS GridFSInputFile] [java.io InputStream File])) @@ -30,17 +30,23 @@ ([] (remove {})) ([query] - (.remove ^GridFS monger.core/*mongodb-gridfs* ^DBObject (to-db-object query)))) + (.remove ^GridFS monger.core/*mongodb-gridfs* ^DBObject (to-db-object query))) + ([^GridFS fs query] + (.remove fs ^DBObject (to-db-object query)))) (defn remove-all - [] - (remove {})) + ([] + (remove {})) + ([^GridFS fs] + (remove fs {}))) (defn all-files ([] (.getFileList ^GridFS monger.core/*mongodb-gridfs*)) ([query] - (.getFileList ^GridFS monger.core/*mongodb-gridfs* query))) + (.getFileList ^GridFS monger.core/*mongodb-gridfs* query)) + ([^GridFS fs query] + (.getFileList fs query))) (defprotocol GridFSInputFileFactory