Merge pull request #7676 from metabase/mongo-tests-fix

Fix Mongo CI test failure

src/metabase/driver/mongo/query_processor.clj

@@ -24,6 +24,14 @@
            org.bson.types.ObjectId
            org.joda.time.DateTime))
 
+;; See http://clojuremongodb.info/articles/integration.html
+;; Loading these namespaces will load appropriate Monger integrations with JODA Time and Cheshire respectively
+;;
+;; These are loaded here and not in the `:require` above because they tend to get automatically removed by
+;; `cljr-clean-ns` and also cause Eastwood to complain about unused namespaces
+(require 'monger.joda-time
+         'monger.json)
+
 (def ^:private ^:const $subtract :$subtract)
 
 

src/metabase/middleware.clj

@@ -298,6 +298,9 @@
 (add-encoder org.postgresql.util.PGobject       encode-jdbc-clob) ; Postgres
 
 ;; Encode BSON undefined like `nil`
+;;
+;; TODO - not sure this is actually needed anymore now that we are loading monger.json --
+;; see http://clojuremongodb.info/articles/integration.html
 (add-encoder org.bson.BsonUndefined encode-nil)
 
 ;; Binary arrays ("[B") -- hex-encode their first four bytes, e.g. "0xC42360D7"