Merge pull request #235 from quelist/fix/update-before-scripts

Add MongoDB shell version detection to before scripts
2024-11-28 15:12:00 -05:00 · 2024-11-28 12:54:54 +05:30 · 2024-04-07 21:30:25 -04:00 · 2024-04-04 10:09:20 -03:00 · 2023-01-19 08:37:42 -06:00 · 2023-01-19 08:37:13 -06:00
42 changed files with 665 additions and 395 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,5 @@ todo.org
 .nrepl-*
 .idea/
 *.iml
+/.clj-kondo/.cache
+/.lsp/.cache
--- a/.travis.yml
+++ b/.travis.yml
@ -1,17 +1,20 @@
 language: clojure
-lein: lein2
+sudo: required
+lein: lein
+dist: xenial
 before_script:
-  - ./bin/ci/install_mongodb.sh  
+  # Give MongoDB server some time to boot
+  - sleep 15
  - mongod --version
  - ./bin/ci/before_script.sh
-script: lein2 do clean, javac, test
+script: lein do clean, javac, test
 jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8
+  - openjdk10
+  - oraclejdk11
+  - openjdk12
 services:
  - mongodb
 branches:
  only:
    - master
-    - 3.0.x-stable
+    - 3.5.x-stable
--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -1,4 +1,53 @@
-## Changes between 3.0.x and 3.1.0
+## Changes between 3.5.x and 3.6.0 (unreleased)
+
+### UUID Representation Option
+
+Added a new connection option, `:uuid-representation`.
+
+Contributed by @okorz001.
+
+GitHub issue: [#212](https://github.com/michaelklishin/monger/issues/212)
+
+### Operator List Update
+
+For MongoDB 4.x.
+
+Contributed by @mjrb.
+
+GitHub issue: [#196](https://github.com/michaelklishin/monger/pull/196)
+
+### Dependency Update
+
+Contributed by @robhanlon22.
+
+GitHub issue: [#206](https://github.com/michaelklishin/monger/pull/206)
+
+
+## Changes between 3.1.x and 3.5.0 (Dec 10th, 2018)
+
+### MongoDB Java Driver Update
+
+MongoDB Java driver dependency has been updated to `3.9.x`.
+
+This means that Monger now **requires JDK 8**.
+
+Contributed by @Linicks.
+
+### 3rd Party Library Compatibility
+
+ * Cheshire `5.8.x`
+ * clj-time `0.15.1`
+ * ring-core `0.15.1`
+ * Ragtime `0.7.x`.
+
+### URI Connection Usability Improvement
+
+URIs that don't specify a database will now be rejected as invalid.
+
+Contributed by Chris Broome.
+
+
+## Changes between 3.0.x and 3.1.0 (September 17th, 2016)

 ### MongoDB Java Driver Update

--- a/README.md
+++ b/README.md
@ -1,14 +1,19 @@
 # Monger, a modern Clojure MongoDB Driver
-
+[![Build Status](https://travis-ci.org/xingzhefeng/monger.svg?branch=master)](https://travis-ci.org/xingzhefeng/monger)
 Monger is an idiomatic [Clojure MongoDB driver](http://clojuremongodb.info) for a more civilized age.

-It has batteries included, offers powerful expressive query DSL, strives to support every MongoDB 2.0+ feature and has sane defaults. Monger is built from for modern Clojure versions and sits on top of the official MongoDB Java driver.
+It has batteries included, offers powerful expressive query DSL,
+strives to support modern MongoDB features and have the "look and feel" and
+flexibility of the MongoDB shell.
+
+Monger is built from for modern Clojure versions and sits on top of
+the official MongoDB Java driver.


 ## Project Goals

 There is one MongoDB client for Clojure that has been around since 2009. So, why create another one? Monger authors
-wanted a client that will
+wanted a client that would

 * Support most of modern MongoDB features, focus on those that really matter.
 * Be [well documented](http://clojuremongodb.info).
@ -24,7 +29,7 @@ wanted a client that will

 ## Project Maturity

-Monger is not a young project: started in July 2011, it is over 3
+Monger is not a young project: started in July 2011, it is over 7
 years old with active production use from week 1.


@ -45,14 +50,14 @@ Maven, add the following repository definition to your `pom.xml`:

 With Leiningen:

-    [com.novemberain/monger "3.0.1"]
+    [com.novemberain/monger "3.5.0"]

 With Maven:

    <dependency>
      <groupId>com.novemberain</groupId>
      <artifactId>monger</artifactId>
-      <version>3.0.1</version>
+      <version>3.5.0</version>
    </dependency>


@ -70,15 +75,13 @@ questions, too!

 Please see our [documentation guides site](http://clojuremongodb.info/) and [API reference](http://reference.clojuremongodb.info).

-Our [test
-suite](https://github.com/michaelklishin/monger/tree/master/test/monger/test)
+Our [test suite](https://github.com/michaelklishin/monger/tree/master/test/monger/test)
 also has many code examples.


 ## Community

-[Monger has a mailing
-list](https://groups.google.com/forum/#!forum/clojure-mongodb). Feel
+[Monger has a mailing list](https://groups.google.com/forum/#!forum/clojure-mongodb). Feel
 free to join it and ask any questions you may have.

 To subscribe for announcements of releases, important changes and so
@ -88,14 +91,13 @@ on Twitter.

 ## Supported Clojure versions

-Monger requires Clojure 1.6+. The most recent
+Monger requires Clojure 1.8+. The most recent
 stable release is highly recommended.


 ## Continuous Integration Status

 [![Continuous Integration status](https://secure.travis-ci.org/michaelklishin/monger.svg)](http://travis-ci.org/michaelklishin/monger)
-[![Dependencies Status](http://jarkeeper.com/michaelklishin/monger/status.svg)](http://jarkeeper.com/michaelklishin/monger)


 ## Monger Is a ClojureWerkz Project
@ -113,6 +115,12 @@ supported Clojure versions using
    ./bin/ci/before_script.sh
    lein all do clean, javac, test

+Or, if you don't have mongodb installed, you can use docker
+
+    docker-compose up
+    ./bin/ci/before_script_docker.sh
+    lein all do clean, javac, test
+
 Then create a branch and make your changes on it. Once you are done with your changes and all tests pass, submit a pull request
 on Github.

@ -120,7 +128,7 @@ on Github.

 ## License

-Copyright (C) 2011-2016 [Michael S. Klishin](http://twitter.com/michaelklishin), Alex Petrov, and the ClojureWerkz team.
+Copyright (C) 2011-2018 [Michael S. Klishin](http://twitter.com/michaelklishin), Alex Petrov, and the ClojureWerkz team.

 Double licensed under the [Eclipse Public License](http://www.eclipse.org/legal/epl-v10.html) (the same as Clojure) or
 the [Apache Public License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
--- a/bin/ci/before_script.sh
+++ b/bin/ci/before_script.sh
@ -1,11 +1,18 @@
 #!/bin/sh

-# MongoDB seems to need some time to boot first. MK.
-sleep 5
+# Check which MongoDB shell is available
+if command -v mongosh >/dev/null 2>&1; then
+    MONGO_SHELL="mongosh"
+elif command -v mongo >/dev/null 2>&1; then
+    MONGO_SHELL="mongo"
+else
+    echo "Error: Neither mongo nor mongosh shell found. Please install MongoDB shell."
+    exit 1
+fi

 # MongoDB Java driver won't run authentication twice on the same DB instance,
 # so we need to use multiple DBs.
-mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"]})' monger-test
-mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"]})' monger-test2
-mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"]})' monger-test3
-mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"]})' monger-test4
+$MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test
+$MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test2
+$MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test3
+$MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test4
--- a/bin/ci/before_script_docker.sh
+++ b/bin/ci/before_script_docker.sh
@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Check which MongoDB shell is available in the container
+if docker exec mongo_test which mongosh >/dev/null 2>&1; then
+    MONGO_SHELL="mongosh"
+elif docker exec mongo_test which mongo >/dev/null 2>&1; then
+    MONGO_SHELL="mongo"
+else
+    echo "Error: Neither mongo nor mongosh shell found in the container."
+    exit 1
+fi
+
+# MongoDB Java driver won't run authentication twice on the same DB instance,
+# so we need to use multiple DBs.
+docker exec mongo_test $MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test
+docker exec mongo_test $MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test2
+docker exec mongo_test $MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test3
+docker exec mongo_test $MONGO_SHELL --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], mechanisms: ["SCRAM-SHA-1"], passwordDigestor: "client"})' monger-test4
--- a/bin/ci/before_script_server_3.6.x.sh
+++ b/bin/ci/before_script_server_3.6.x.sh
@ -0,0 +1,11 @@
+#!/bin/sh
+
+# MongoDB seems to need some time to boot first. MK.
+sleep 5
+
+# MongoDB Java driver won't run authentication twice on the same DB instance,
+# so we need to use multiple DBs.
+mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], passwordDigestor: "client"})' monger-test
+mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], passwordDigestor: "client"})' monger-test2
+mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], passwordDigestor: "client"})' monger-test3
+mongo --eval 'db.createUser({"user": "clojurewerkz/monger", "pwd": "monger", roles: ["dbAdmin"], passwordDigestor: "client"})' monger-test4
--- a/bin/ci/install_mongodb.sh
+++ b/bin/ci/install_mongodb.sh
@ -1,7 +1,8 @@
 #!/bin/sh

-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
-echo "deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org.list
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
+
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list

 sudo apt-get update
 sudo apt-get install -y mongodb-org
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,11 @@
+# Use root/example as user/password credentials
+version: '3.1'
+
+services:
+
+  mongo:
+    image: mongo
+    container_name: mongo_test
+    restart: always
+    ports:
+      - "27017:27017"
--- a/project.clj
+++ b/project.clj
@ -1,12 +1,12 @@
-(defproject com.novemberain/monger "3.1.0"
+(defproject com.novemberain/monger "4.0.0-SNAPSHOT"
  :description "Monger is a Clojure MongoDB client for a more civilized age: friendly, flexible and with batteries included"
  :url "http://clojuremongodb.info"
  :min-lein-version "2.5.1"
  :license {:name "Eclipse Public License"
            :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure        "1.8.0"]
-                 [org.mongodb/mongodb-driver "3.3.0"]
-                 [clojurewerkz/support       "1.1.0"]]
+  :dependencies [[org.clojure/clojure        "1.11.1"]
+                 [org.mongodb/mongodb-driver "3.12.11"]
+                 [clojurewerkz/support       "1.5.0"]]
  :test-selectors {:default     (fn [m]
                                  (and (not (:performance m))
                                       (not (:edge-features m))
@ -27,35 +27,32 @@
                   :all           (constantly true)}
  :source-paths      ["src/clojure"]
  :java-source-paths ["src/java"]
-  :javac-options     ["-target" "1.6" "-source" "1.6"]
+  :javac-options     ["-target" "1.8" "-source" "1.8"]
  :mailing-list {:name "clojure-mongodb"
                 :archive "https://groups.google.com/group/clojure-mongodb"
                 :post "clojure-mongodb@googlegroups.com"}
-  :profiles {:dj02x {:dependencies [[org.clojure/data.json  "0.2.6" :exclusions [org.clojure/clojure]]]}
-             :1.6    {:dependencies [[org.clojure/clojure "1.6.0"]]}
-             :1.7    {:dependencies [[org.clojure/clojure "1.7.0"]]}
-             :1.9    {:dependencies [[org.clojure/clojure "1.9.0-alpha11"]]}
-             :master {:dependencies [[org.clojure/clojure "1.9.0-master-SNAPSHOT"]]}
+  :profiles {:1.10 {:dependencies [[org.clojure/clojure "1.10.2"]]}
+             :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
             :dev {:resource-paths ["test/resources"]
-                   :dependencies  [[clj-time               "0.8.0" :exclusions [org.clojure/clojure]]
-                                   [cheshire               "5.5.0" :exclusions [org.clojure/clojure]]
-                                   [org.clojure/data.json  "0.2.5" :exclusions [org.clojure/clojure]]
-                                   [org.clojure/tools.cli  "0.3.1" :exclusions [org.clojure/clojure]]
-                                   [org.clojure/core.cache "0.6.3" :exclusions [org.clojure/clojure]]
-                                   [ring/ring-core         "1.3.0" :exclusions [org.clojure/clojure]]
-                                   [com.novemberain/validateur "2.4.2" :exclusions [org.clojure/clojure]]
-                                   [ch.qos.logback/logback-classic "1.1.3" :exclusions [org.slf4j/slf4j-api]]
-                                   [ragtime/ragtime.core   "0.3.7" :exclusions [org.clojure/clojure]]]
-                   :plugins [[lein-codox "0.9.0"]]
+                   :dependencies  [[clj-time               "0.15.1" :exclusions [org.clojure/clojure]]
+                                   [cheshire               "5.8.1" :exclusions [org.clojure/clojure]]
+                                   [org.clojure/data.json  "2.5.0" :exclusions [org.clojure/clojure]]
+                                   [org.clojure/tools.cli  "0.4.1" :exclusions [org.clojure/clojure]]
+                                   [org.clojure/core.cache "0.7.1" :exclusions [org.clojure/clojure]]
+                                   [ring/ring-core         "1.7.1" :exclusions [org.clojure/clojure]]
+                                   [com.novemberain/validateur "2.6.0" :exclusions [org.clojure/clojure]]
+                                   [ch.qos.logback/logback-classic "1.2.3" :exclusions [org.slf4j/slf4j-api]]
+                                   [ragtime/core "0.7.2" :exclusions [org.clojure/clojure]]]
+                   :plugins [[lein-codox "0.10.5"]]
                   :codox {:source-paths ["src/clojure"]
                           :namespaces [#"^monger\.(?!internal)"]}}
             ;; only clj-time/JodaTime available, used to test monger.joda-time w/o clojure.data.json
             :dev2 {:resource-paths ["test/resources"]
-                    :dependencies  [[clj-time "0.8.0"               :exclusions [org.clojure/clojure]]]}}
-  :aliases {"all" ["with-profile" "dev:dev,1.6:dev,1.8:dev,dj02x"]}
-  :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
+                    :dependencies  [[clj-time "0.15.2"               :exclusions [org.clojure/clojure]]]}}
+  :aliases {"all" ["with-profile" "dev:dev,1.10:dev,1.9:dev"]}
+  :repositories {"sonatype" {:url "https://oss.sonatype.org/content/repositories/releases"
                             :snapshots false
                             :releases {:checksum :fail :update :always}}
-                 "sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
+                 "sonatype-snapshots" {:url "https://oss.sonatype.org/content/repositories/snapshots"
                                       :snapshots true
                                       :releases {:checksum :fail :update :always}}})
--- a/src/clojure/monger/cache.clj
+++ b/src/clojure/monger/cache.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/collection.clj
+++ b/src/clojure/monger/collection.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;; Copyright (c) 2012 Toby Hede
 ;; Copyright (c) 2012 Baishampayan Ghose
 ;;
@ -24,7 +24,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; Copyright (c) 2012 Toby Hede
 ;; Copyright (c) 2012 Baishampayan Ghose
 ;;
@ -50,7 +50,7 @@
   * http://clojuremongodb.info/articles/updating.html
   * http://clojuremongodb.info/articles/deleting.html
   * http://clojuremongodb.info/articles/aggregation.html"
-  (:refer-clojure :exclude [find remove count drop distinct empty? update])
+  (:refer-clojure :exclude [find remove count drop distinct empty? any? update])
  (:import [com.mongodb Mongo DB DBCollection WriteResult DBObject WriteConcern
            DBCursor MapReduceCommand MapReduceCommand$OutputType AggregationOutput
            AggregationOptions AggregationOptions$OutputMode]
@ -109,7 +109,7 @@


 (defn ^WriteResult insert-batch
-  "Saves documents do collection. You can optionally specify WriteConcern as a third argument."
+  "Saves documents to collection. You can optionally specify WriteConcern as a third argument."
  ([^DB db ^String coll ^List documents]
     (.insert (.getCollection db (name coll))
              ^List (to-db-object documents)
@ -467,7 +467,7 @@


 (defn exists?
-  "Checks weather collection with certain name exists."
+  "Checks whether collection with certain name exists."
  ([^DB db ^String coll]
     (.collectionExists db coll)))

@ -490,9 +490,9 @@
 (defn rename
  "Renames collection."
  ([^DB db ^String from, ^String to]
-     (.rename (.getCollection db from) to))
+     (.rename (.getCollection db (name from)) (name to)))
  ([^DB db ^String from ^String to drop-target?]
-     (.rename (.getCollection db from) to drop-target?)))
+     (.rename (.getCollection db (name from)) (name to) drop-target?)))

 ;;
 ;; Map/Reduce
@ -541,20 +541,24 @@
  is supported, for specifying a limit on the execution time of the query in
  milliseconds.

+  :keywordize option that control if resulting map keys will be turned into keywords, default is true.
+
  See http://docs.mongodb.org/manual/applications/aggregation/ to learn more."
  [^DB db ^String coll stages & opts]
-  (let [coll (.getCollection db coll)
+  (let [coll (.getCollection db (name coll))
        agg-opts (build-aggregation-options opts)
        pipe (into-array-list (to-db-object stages))
-        res (.aggregate coll pipe agg-opts)]
-    (map #(from-db-object % true) (iterator-seq res))))
+        res (.aggregate coll pipe agg-opts)
+        {:keys [^Boolean keywordize]
+         :or            {keywordize true}} opts]
+    (map #(from-db-object % keywordize) (iterator-seq res))))

 (defn explain-aggregate
  "Returns the explain plan for an aggregation query. MongoDB 2.2+ only.

  See http://docs.mongodb.org/manual/applications/aggregation/ to learn more."
  [^DB db ^String coll stages & opts]
-  (let [coll (.getCollection db coll)
+  (let [coll (.getCollection db (name coll))
        agg-opts (build-aggregation-options opts)
        pipe (into-array-list (to-db-object stages))
        res (.explainAggregate coll pipe agg-opts)]
--- a/src/clojure/monger/command.clj
+++ b/src/clojure/monger/command.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;; Copyright (c) 2012 Toby Hede
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
@ -23,7 +23,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; Copyright (c) 2012 Toby Hede
 ;; All rights reserved.
 ;;
--- a/src/clojure/monger/constraints.clj
+++ b/src/clojure/monger/constraints.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/conversion.clj
+++ b/src/clojure/monger/conversion.clj
@ -5,7 +5,7 @@
 ;;
 ;; ----------------------------------------------------------------------------------
 ;; Portions of the code are Copyright (c) 2009 Andrew Boekhoff
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -24,7 +24,7 @@
 ;;
 ;; ----------------------------------------------------------------------------------
 ;; Portions of the code are Copyright (c) 2009 Andrew Boekhoff
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -46,7 +46,8 @@
  (:import [com.mongodb DBObject BasicDBObject BasicDBList DBCursor]
           [clojure.lang IPersistentMap Named Keyword Ratio]
           [java.util List Map Date Set]
-           org.bson.types.ObjectId))
+           org.bson.types.ObjectId
+           (org.bson.types Decimal128)))

 (defprotocol ConvertToDBObject
  (^com.mongodb.DBObject to-db-object [input] "Converts given piece of Clojure data to BasicDBObject MongoDB Java driver uses"))
@ -104,27 +105,30 @@



-
 (defprotocol ConvertFromDBObject
  (from-db-object [input keywordize] "Converts given DBObject instance to a piece of Clojure data"))

 (extend-protocol ConvertFromDBObject
  nil
-  (from-db-object [input keywordize] input)
+  (from-db-object [_ _] nil)

  Object
-  (from-db-object [input keywordize] input)
+  (from-db-object [input _] input)
+
+  Decimal128
+  (from-db-object [^Decimal128 input _]
+    (.bigDecimalValue input))

  List
  (from-db-object [^List input keywordize]
-    (vec (map #(from-db-object % keywordize) input)))
+    (mapv #(from-db-object % keywordize) input))

  BasicDBList
  (from-db-object [^BasicDBList input keywordize]
-    (vec (map #(from-db-object % keywordize) input)))
+    (mapv #(from-db-object % keywordize) input))

  com.mongodb.DBRef
-  (from-db-object [^com.mongodb.DBRef input keywordize]
+  (from-db-object [^com.mongodb.DBRef input _]
    input)

  DBObject
@ -132,13 +136,13 @@
    ;; DBObject provides .toMap, but the implementation in
    ;; subclass GridFSFile unhelpfully throws
    ;; UnsupportedOperationException.
+    (persistent!
     (reduce (if keywordize
               (fn [m ^String k]
-                (assoc m (keyword k) (from-db-object (.get input k) true)))
+                 (assoc! m (keyword k) (from-db-object (.get input k) true)))
               (fn [m ^String k]
-                (assoc m k (from-db-object (.get input k) false))))
-            {} (.keySet input))))
-
+                 (assoc! m k (from-db-object (.get input k) false))))
+             (transient {}) (.keySet input)))))


 (defprotocol ConvertToObjectId
--- a/src/clojure/monger/core.clj
+++ b/src/clojure/monger/core.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -71,6 +71,7 @@
     :port (27017 by default)"
  {:arglists '([]
               [server-address options]
+               [server-address options credentials]
               [[server-address & more] options]
               [{:keys [host port uri] :or { host *mongodb-host* port *mongodb-port*}}])}
  ([]
@ -135,56 +136,78 @@
     (ServerAddress. hostname port)))

 (defn ^MongoClientOptions$Builder mongo-options-builder
-  [{:keys [connections-per-host threads-allowed-to-block-for-connection-multiplier
-           max-wait-time connect-timeout socket-timeout socket-keep-alive auto-connect-retry max-auto-connect-retry-time
-           description write-concern cursor-finalizer-enabled read-preference required-replica-set-name
-           add-command-listener always-use-mbeans codec-registry db-decoder-factory db-encoder-factory
-           heartbeat-connect-timeout heartbeat-frequency heartbeat-socket-timeout local-threshold
-           max-connection-idle-time max-connection-life-time min-connections-per-host min-heartbeat-frequency
-           read-concern server-selection-timeout socket-factory ssl-enabled ssl-invalid-host-name-allowed]}]
+  [{:keys [add-cluster-listener add-cluster-listeners add-command-listener add-command-listeners
+           add-connection-pool-listener add-connection-pool-listeners add-server-listener add-server-listeners
+           add-server-monitor-listener add-server-monitor-listeners always-use-mbeans application-name
+           codec-registry compressor-list connect-timeout connections-per-host cursor-finalizer-enabled
+           db-decoder-factory db-encoder-factory description heartbeat-connect-timeout heartbeat-frequency
+           heartbeat-socket-timeout local-threshold max-connection-idle-time max-connection-life-time
+           max-wait-time min-connections-per-host min-heartbeat-frequency read-concern read-preference
+           required-replica-set-name retry-writes server-selection-timeout server-selector socket-keep-alive 
+           socket-factory socket-timeout ssl-context ssl-enabled ssl-invalid-host-name-allowed
+           threads-allowed-to-block-for-connection-multiplier uuid-representation write-concern]}]
  (let [mob (MongoClientOptions$Builder.)]
-    (when connections-per-host
-      (.connectionsPerHost mob connections-per-host))
-    (when threads-allowed-to-block-for-connection-multiplier
-      (.threadsAllowedToBlockForConnectionMultiplier mob threads-allowed-to-block-for-connection-multiplier))
-    (when max-wait-time
-      (.maxWaitTime mob max-wait-time))
-    (when connect-timeout
-      (.connectTimeout mob connect-timeout))
-    (when socket-timeout
-      (.socketTimeout mob socket-timeout))
-    (when socket-keep-alive
-      (.socketKeepAlive mob socket-keep-alive))
-    (when read-preference
-      (.readPreference mob read-preference))
-    (when description
-      (.description mob description))
-    (when write-concern
-      (.writeConcern mob write-concern))
-    (when cursor-finalizer-enabled
-      (.cursorFinalizerEnabled mob cursor-finalizer-enabled))
-    (when required-replica-set-name
-      (.requiredReplicaSetName mob required-replica-set-name))
+    (when add-cluster-listener
+      (.addClusterListener mob add-cluster-listener))
+    (when add-cluster-listeners
+      (doseq [cluster-listener add-cluster-listeners]
+        (.addClusterListener mob cluster-listener)))
    (when add-command-listener
      (.addCommandListener mob add-command-listener))
+    (when add-command-listeners
+      (doseq [command-listener add-command-listeners]
+        (.addCommandListener mob command-listener)))
+    (when add-connection-pool-listener
+      (.addConnectionPoolListener mob add-connection-pool-listener))
+    (when add-connection-pool-listeners
+      (doseq [connection-pool-listener add-connection-pool-listeners]
+        (.addConnectionPoolListener mob connection-pool-listener)))
+    (when add-server-listener
+      (.addServerListener mob add-server-listener))
+    (when add-server-listeners
+      (doseq [server-listener add-server-listeners]
+        (.addServerListener mob server-listener)))
+    (when add-server-monitor-listener
+      (.addServerMonitorListener mob add-server-monitor-listener))
+    (when add-server-monitor-listeners
+      (doseq [server-monitor-listener add-server-monitor-listeners]
+        (.addServerMonitorListener mob server-monitor-listener)))
+    (when always-use-mbeans
+      (.alwaysUseMBeans mob always-use-mbeans))
+    (when application-name
+      (.applicationName mob application-name))
    (when always-use-mbeans
      (.alwaysUseMBeans mob always-use-mbeans))
    (when codec-registry
      (.codecRegistry mob codec-registry))
+    (when compressor-list
+      (.compressorList mob compressor-list))
+    (when connections-per-host
+      (.connectionsPerHost mob connections-per-host))
+    (when connect-timeout
+      (.connectTimeout mob connect-timeout))
+    (when cursor-finalizer-enabled
+      (.cursorFinalizerEnabled mob cursor-finalizer-enabled))
    (when db-decoder-factory
      (.dbDecoderFactory mob db-decoder-factory))
    (when db-encoder-factory
      (.dbEncoderFactory mob db-encoder-factory))
+    (when description
+      (.description mob description))
    (when heartbeat-connect-timeout
      (.heartbeatConnectTimeout mob heartbeat-connect-timeout))
    (when heartbeat-frequency
      (.heartbeatFrequency mob heartbeat-frequency))
    (when heartbeat-socket-timeout
      (.heartbeatSocketTimeout mob heartbeat-socket-timeout))
+    (when ssl-context
+      (.sslContext mob ssl-context))
    (when local-threshold
      (.localThreshold mob local-threshold))
    (when max-connection-idle-time
      (.maxConnectionIdleTime mob max-connection-idle-time))
+    (when max-wait-time
+      (.maxWaitTime mob max-wait-time))
    (when max-connection-life-time
      (.maxConnectionLifeTime mob max-connection-life-time))
    (when min-connections-per-host
@ -193,14 +216,32 @@
      (.minHeartbeatFrequency mob min-heartbeat-frequency))
    (when read-concern
      (.readConcern mob read-concern))
+    (when read-preference
+      (.readPreference mob read-preference))
+    (when required-replica-set-name
+      (.requiredReplicaSetName mob required-replica-set-name))
+    (when retry-writes
+      (.retryWrites mob retry-writes))
    (when server-selection-timeout
      (.serverSelectionTimeout mob server-selection-timeout))
+    (when server-selector
+      (.serverSelector mob server-selector))
+    (when socket-keep-alive
+      (.socketKeepAlive mob socket-keep-alive))
    (when socket-factory
      (.socketFactory mob socket-factory))
+    (when socket-timeout
+      (.socketTimeout mob socket-timeout))
    (when ssl-enabled
      (.sslEnabled mob ssl-enabled))
    (when ssl-invalid-host-name-allowed
      (.sslInvalidHostNameAllowed mob ssl-invalid-host-name-allowed))
+    (when threads-allowed-to-block-for-connection-multiplier
+      (.threadsAllowedToBlockForConnectionMultiplier mob threads-allowed-to-block-for-connection-multiplier))
+    (when uuid-representation
+      (.uuidRepresentation mob uuid-representation))
+    (when write-concern
+      (.writeConcern mob write-concern))
    mob))

 (defn ^MongoClientOptions mongo-options
@ -233,9 +274,10 @@
   If username and password are provided, performs authentication."
  [^String uri-string]
  (let [uri    (MongoClientURI. uri-string)
-        conn (MongoClient. uri)
-        db   (.getDB conn (.getDatabase uri))]
-    {:conn conn :db db}))
+        conn   (MongoClient. uri)]
+    (if-let [dbName (.getDatabase uri)]
+      {:conn conn :db (.getDB conn dbName)}
+      (throw (IllegalArgumentException. "No database name specified in URI. Monger requires a database to be explicitly configured.")))))

 (defn ^com.mongodb.CommandResult command
  "Runs a database command (please check MongoDB documentation for the complete list of commands).
--- a/src/clojure/monger/credentials.clj
+++ b/src/clojure/monger/credentials.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/cursor.clj
+++ b/src/clojure/monger/cursor.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/db.clj
+++ b/src/clojure/monger/db.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;; Copyright (c) 2012 Toby Hede
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
@ -23,7 +23,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; Copyright (c) 2012 Toby Hede
 ;; All rights reserved.
 ;;
--- a/src/clojure/monger/gridfs.clj
+++ b/src/clojure/monger/gridfs.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -114,9 +114,30 @@
  (to-input-stream [^InputStream input]
    input))

+(defprotocol GridFSInputFileFactory
+  (^GridFSInputFile create-gridfs-file [input ^GridFS fs] "Creates a file entry"))
+
+(extend byte-array-type
+  GridFSInputFileFactory
+  {:create-gridfs-file (fn [^bytes input ^GridFS fs]
+                         (.createFile fs input))})
+
+(extend-protocol GridFSInputFileFactory
+  String
+  (create-gridfs-file [^String input ^GridFS fs]
+    (.createFile fs (io/file input)))
+
+  File
+  (create-gridfs-file [^File input ^GridFS fs]
+    (.createFile fs input))
+
+  InputStream
+  (create-gridfs-file [^InputStream input ^GridFS fs]
+    (.createFile fs input)))
+
 (defn ^GridFSInputFile make-input-file
  [^GridFS fs input]
-  (.createFile fs (to-input-stream input)))
+  (create-gridfs-file input fs))

 (defmacro store
  [^GridFSInputFile input & body]
--- a/src/clojure/monger/internal/pagination.clj
+++ b/src/clojure/monger/internal/pagination.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/joda_time.clj
+++ b/src/clojure/monger/joda_time.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/js.clj
+++ b/src/clojure/monger/js.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/json.clj
+++ b/src/clojure/monger/json.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -70,13 +70,19 @@
            (try
              (extend-protocol clojure.data.json/JSONWriter
                ObjectId
-                (-write [^ObjectId object out]
-                  (clojure.data.json/write (.toString object) out)))
+                (-write
+                  ([^ObjectId object out]
+                   (clojure.data.json/write (.toString object) out))
+                  ([^ObjectId object out options]
+                   (clojure.data.json/write (.toString object) out options))))

              (extend-protocol clojure.data.json/JSONWriter
                BSONTimestamp
-                  (-write [^BSONTimestamp object out]
-                    (clojure.data.json/write {:time (.getTime object) :inc (.getInc object)} out)))
+                (-write
+                  ([^BSONTimestamp object out]
+                   (clojure.data.json/write {:time (.getTime object) :inc (.getInc object)} out))
+                  ([^BSONTimestamp object out options]
+                   (clojure.data.json/write {:time (.getTime object) :inc (.getInc object)} out options))))

              (catch Throwable _
                false))
--- a/src/clojure/monger/operators.clj
+++ b/src/clojure/monger/operators.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -46,6 +46,8 @@
 ;; QUERY OPERATORS
 ;;

+(declare $gt $gte $lt $lte $all $in $nin $eq $ne $elemMatch $regex $options)
+
 ;; $gt is "greater than" comparator
 ;; $gte is "greater than or equals" comparator
 ;; $gt is "less than" comparator
@ -80,10 +82,16 @@
 ;;   (mgcol/find-maps "languages" { :tags { $nin [ "functional" ] } } )
 (defoperator $nin)

+;; $eq is "equals" comparator
+;;
+;; EXAMPLES:
+;;   (monger.collection/find "libraries" { :language { $eq "Clojure" }})
+(defoperator $eq)
+
 ;; $ne is "non-equals" comparator
 ;;
 ;; EXAMPLES:
-;;   (monger.collection/find "libraries" {$ne { :language "Clojure" }})
+;;   (monger.collection/find "libraries" { :language { $ne "Clojure" }})
 (defoperator $ne)

 ;; $elemMatch checks if an element in an array matches the specified expression
@ -96,6 +104,37 @@
 (defoperator $regex)
 (defoperator $options)

+;; comment on a query predicate
+
+(declare $comment $explain $hint $maxTimeMS $orderBy $query $returnKey $showDiskLoc $natural)
+
+(defoperator $comment)
+(defoperator $explain)
+(defoperator $hint)
+(defoperator $maxTimeMS)
+(defoperator $orderBy)
+(defoperator $query)
+(defoperator $returnKey)
+(defoperator $showDiskLoc)
+(defoperator $natural)
+
+
+;;
+;; EVALUATION (QUERY)
+;;
+
+(declare $expr $jsonSchema $where $and $or $nor)
+
+(defoperator $expr)
+(defoperator $jsonSchema)
+
+;; Matches documents that satisfy a JavaScript expression.
+;;
+;; EXAMPLES:
+;;
+;;   (monger.collection/find "people" { $where "this.placeOfBirth === this.address.city" })
+(defoperator $where)
+
 ;;
 ;; LOGIC OPERATORS
 ;;
@ -128,6 +167,8 @@
 ;; ATOMIC MODIFIERS
 ;;

+(declare $inc $mul $set $unset $setOnInsert $rename $push $position $each $addToSet $pop $pull $pullAll $bit $bitsAllClear $bitsAllSet $bitsAnyClear $bitsAnySet $exists $mod $size $type $not)
+
 ;; $inc increments one or many fields for the given value, otherwise sets the field to value
 ;;
 ;; EXAMPLES:
@ -171,6 +212,9 @@
 ;;   (mgcol/update "docs" { :_id oid } { $push { :tags "modifiers" } })
 (defoperator $push)

+;; $position modifies the behavior of $push per https://docs.mongodb.com/manual/reference/operator/update/position/
+(defoperator $position)
+
 ;; $each is a modifier for the $push and $addToSet operators for appending multiple values to an array field.
 ;; Without the $each modifier $push and $addToSet will append an array as a single value.
 ;; MongoDB 2.4 adds support for the $each modifier to the $push operator.
@ -180,14 +224,6 @@
 ;;   (mgcol/update coll { :_id oid } { $push { :tags { $each ["mongodb" "docs"] } } })
 (defoperator $each)

-;; $pushAll appends each value in value_array to field, if field is an existing array, otherwise sets field to the array value_array
-;; if field is not present. If field is present but is not an array, an error condition is raised.
-;; Deprecated since MongoDB 2.4, $push with $each modifier should be used instead.
-;;
-;; EXAMPLES:
-;;   (mgcol/update coll { :_id oid } { $pushAll { :tags ["mongodb" "docs"] } })
-(defoperator $pushAll)
-
 ;; $addToSet Adds value to the array only if its not in the array already, if field is an existing array, otherwise sets field to the
 ;; array value if field is not present. If field is present but is not an array, an error condition is raised.
 ;;
@ -214,11 +250,15 @@
 ;; an error condition is raised.
 ;;
 ;; EXAMPLES:
-;;   (mgcol/update coll { :_id oid } { $pull { :measurements 1.2 } })
-;;   (mgcol/update coll { :_id oid } { $pull { :measurements { $gte 1.2 } } })
+;;   (mgcol/update coll { :_id oid } { $pullAll { :measurements 1.2 } })
+;;   (mgcol/update coll { :_id oid } { $pullAll { :measurements { $gte 1.2 } } })
 (defoperator $pullAll)

 (defoperator $bit)
+(defoperator $bitsAllClear)
+(defoperator $bitsAllSet)
+(defoperator $bitsAnyClear)
+(defoperator $bitsAnySet)

 (defoperator $exists)
 (defoperator $mod)
@ -228,36 +268,132 @@


 ;;
-;; Aggregation in 2.2
+;; Aggregation in 4.2
 ;;

+(declare $addFields $bucket $bucketAuto $collStats $facet $geoNear $graphLookup $indexStats $listSessions $lookup $match $merge $out $planCacheStats $project $redact $replaceRoot $replaceWith $sample $limit $skip $unwind $group $sort $sortByCount $currentOp $listLocalSessions $cmp $min $max $avg $stdDevPop $stdDevSamp $sum $let $first $last $abs $add $ceil $divide $exp $floor $ln $log $log10 $multiply $pow $round $sqrt $subtract $trunc $literal $arrayElemAt $arrayToObject $concatArrays $filter $indexOfArray $isArray $map $objectToArray $range $reduce $reverseArray $zip $mergeObjects $allElementsTrue $anyElementsTrue $setDifference $setEquals $setIntersection $setIsSubset $setUnion $strcasecmp $substr $substrBytes $substrCP $toLower $toString $toUpper $concat $indexOfBytes $indexOfCP $ltrim $regexFind $regexFindAll $regexMatch $rtrim $split $strLenBytes $subLenCP $trim $sin $cos $tan $asin $acos $atan $atan2 $asinh $acosh $atanh $radiansToDegrees $degreesToRadians $convert $toBool $toDecimal $toDouble $toInt $toLong $toObjectId $dayOfMonth $dayOfWeek $dayOfYear $hour $minute $month $second $millisecond $week $year $isoDate $dateFromParts $dateFromString $dateToParts $dateToString $isoDayOfWeek $isoWeek $isoWeekYear $toDate $ifNull $cond $switch)
+
+(defoperator $addFields)
+(defoperator $bucket)
+(defoperator $bucketAuto)
+(defoperator $collStats)
+(defoperator $facet)
+(defoperator $geoNear)
+(defoperator $graphLookup)
+(defoperator $indexStats)
+(defoperator $listSessions)
+(defoperator $lookup)
 (defoperator $match)
+(defoperator $merge)
+(defoperator $out)
+(defoperator $planCacheStats)
 (defoperator $project)
+(defoperator $redact)
+(defoperator $replaceRoot)
+(defoperator $replaceWith)
+(defoperator $sample)
 (defoperator $limit)
 (defoperator $skip)
 (defoperator $unwind)
 (defoperator $group)
 (defoperator $sort)
+(defoperator $sortByCount)
+
+(defoperator $currentOp)
+(defoperator $listLocalSessions)

 (defoperator $cmp)

 (defoperator $min)
 (defoperator $max)
 (defoperator $avg)
+(defoperator $stdDevPop)
+(defoperator $stdDevSamp)
 (defoperator $sum)
+(defoperator $let)

 (defoperator $first)
 (defoperator $last)

+(defoperator $abs)
 (defoperator $add)
+(defoperator $ceil)
 (defoperator $divide)
+(defoperator $exp)
+(defoperator $floor)
+(defoperator $ln)
+(defoperator $log)
+(defoperator $log10)
 (defoperator $multiply)
-(defoperator $substract)
+(defoperator $pow)
+(defoperator $round)
+(defoperator $sqrt)
+(defoperator $subtract)
+(defoperator $trunc)
+(defoperator $literal)
+
+(defoperator $arrayElemAt)
+(defoperator $arrayToObject)
+(defoperator $concatArrays)
+(defoperator $filter)
+(defoperator $indexOfArray)
+(defoperator $isArray)
+(defoperator $map)
+(defoperator $objectToArray)
+(defoperator $range)
+(defoperator $reduce)
+(defoperator $reverseArray)
+(defoperator $zip)
+(defoperator $mergeObjects)
+
+(defoperator $allElementsTrue)
+(defoperator $anyElementsTrue)
+(defoperator $setDifference)
+(defoperator $setEquals)
+(defoperator $setIntersection)
+(defoperator $setIsSubset)
+(defoperator $setUnion)

 (defoperator $strcasecmp)
 (defoperator $substr)
+(defoperator $substrBytes)
+(defoperator $substrCP)
 (defoperator $toLower)
+(defoperator $toString)
 (defoperator $toUpper)
+(defoperator $concat)
+(defoperator $indexOfBytes)
+(defoperator $indexOfCP)
+(defoperator $ltrim)
+(defoperator $regexFind)
+(defoperator $regexFindAll)
+(defoperator $regexMatch)
+(defoperator $rtrim)
+(defoperator $split)
+(defoperator $strLenBytes)
+(defoperator $subLenCP)
+(defoperator $trim)
+
+(defoperator $sin)
+(defoperator $cos)
+(defoperator $tan)
+(defoperator $asin)
+(defoperator $acos)
+(defoperator $atan)
+(defoperator $atan2)
+(defoperator $asinh)
+(defoperator $acosh)
+(defoperator $atanh)
+(defoperator $radiansToDegrees)
+(defoperator $degreesToRadians)
+
+(defoperator $convert)
+(defoperator $toBool)
+(defoperator $toDecimal)
+(defoperator $toDouble)
+(defoperator $toInt)
+(defoperator $toLong)
+(defoperator $toObjectId)

 (defoperator $dayOfMonth)
 (defoperator $dayOfWeek)
@ -270,19 +406,40 @@
 (defoperator $week)
 (defoperator $year)
 (defoperator $isoDate)
+(defoperator $dateFromParts)
+(defoperator $dateFromString)
+(defoperator $dateToParts)
+(defoperator $dateToString)
+(defoperator $isoDayOfWeek)
+(defoperator $isoWeek)
+(defoperator $isoWeekYear)
+(defoperator $toDate)


 (defoperator $ifNull)
 (defoperator $cond)
+(defoperator $switch)

+;; Geospatial
+(declare $geoWithin $geoIntersects $near $nearSphere $geometry $maxDistance $minDistance $center $centerSphere $box $polygon $slice)
 (defoperator $geoWithin)
 (defoperator $geoIntersects)
 (defoperator $near)
+(defoperator $nearSphere)
+(defoperator $geometry)
+(defoperator $maxDistance)
+(defoperator $minDistance)
+(defoperator $center)
+(defoperator $centerSphere)
+(defoperator $box)
+(defoperator $polygon)

 (defoperator $slice)

 ;; full text search
+(declare $text $meta $search $language $natural $currentDate $isolated $count)
 (defoperator $text)
+(defoperator $meta)
 (defoperator $search)
 (defoperator $language)
 (defoperator $natural)
@ -292,3 +449,11 @@
 ;; EXAMPLES:
 ;;   (mgcol/update coll { :_id oid } { $currentDate { :lastModified true } })
 (defoperator $currentDate)
+
+;; Isolates intermediate multi-document updates from other clients.
+;;
+;; EXAMPLES:
+;;   (mgcol/update "libraries" { :language "Clojure", $isolated 1 } { $inc { :popularity 1 } } {:multi true})
+(defoperator $isolated)
+
+(defoperator $count)
--- a/src/clojure/monger/query.clj
+++ b/src/clojure/monger/query.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -43,6 +43,7 @@
            [monger.conversion :refer :all]
            [monger.operators :refer :all])
  (:import [com.mongodb DB DBCollection DBObject DBCursor ReadPreference]
+           [java.util.concurrent TimeUnit]
           java.util.List))


@ -96,6 +97,7 @@
           snapshot
           read-preference
           keywordize-fields
+           max-time
           options]
    :or { limit 0 batch-size 256 skip 0 } }]
  (with-open [cursor (doto (.find collection (to-db-object query) (as-field-selector fields))
@ -109,6 +111,8 @@
      (.hint cursor (to-db-object hint)))
    (when read-preference
      (.setReadPreference cursor read-preference))
+    (when max-time
+      (.maxTime cursor max-time TimeUnit/MILLISECONDS))
    (when options
      (add-options cursor options))
    (map (fn [x] (from-db-object x keywordize-fields))
@ -154,6 +158,10 @@
  [m ^ReadPreference rp]
  (merge m { :read-preference rp }))

+(defn max-time
+  [m ^long max-time]
+  (merge m { :max-time max-time }))
+
 (defn options
  [m opts]
  (merge m { :options opts }))
--- a/src/clojure/monger/ragtime.clj
+++ b/src/clojure/monger/ragtime.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -34,7 +34,7 @@
 (ns monger.ragtime
  "Ragtime integration"
  (:refer-clojure :exclude [find sort])
-  (:require [ragtime.core      :as ragtime]
+  (:require [ragtime.protocols :as proto]
            [monger.core       :as mg]
            [monger.collection :as mc]
            [monger.query :refer [with-collection find sort]])
@ -47,7 +47,7 @@


 (extend-type com.mongodb.DB
-  ragtime/Migratable
+  proto/DataStore
  (add-migration-id [db id]
    (mc/insert db migrations-collection {:_id id :created_at (Date.)} WriteConcern/FSYNC_SAFE))
  (remove-migration-id [db id]
--- a/src/clojure/monger/result.clj
+++ b/src/clojure/monger/result.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -65,3 +65,8 @@
  (acknowledged?
    [^CommandResult result]
    (.ok result)))
+
+(defn affected-count
+  "Get the number of documents affected"
+  [^WriteResult result]
+  (.getN result))
--- a/src/clojure/monger/ring/session_store.clj
+++ b/src/clojure/monger/ring/session_store.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
--- a/src/clojure/monger/util.clj
+++ b/src/clojure/monger/util.clj
@ -4,7 +4,7 @@
 ;; The APL v2.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
 ;; The EPL v1.0:
 ;;
 ;; ----------------------------------------------------------------------------------
-;; Copyright (c) 2011-2015 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
+;; Copyright (c) 2011-2018 Michael S. Klishin, Alex Petrov, and the ClojureWerkz Team.
 ;; All rights reserved.
 ;;
 ;; This program and the accompanying materials are made available under the terms of
@ -32,12 +32,14 @@
 ;; ----------------------------------------------------------------------------------

 (ns ^{:doc "Provides various utility functions, primarily for working with document ids."} monger.util
+  (:refer-clojure :exclude [random-uuid])
  (:import java.security.SecureRandom
           java.math.BigInteger
           org.bson.types.ObjectId
           com.mongodb.DBObject
           clojure.lang.IPersistentMap
-           java.util.Map))
+           java.util.Map)
+  (:refer-clojure :exclude [random-uuid]))

 ;;
 ;; API
--- a/test/monger/test/aggregation_framework_test.clj
+++ b/test/monger/test/aggregation_framework_test.clj
@ -15,6 +15,27 @@

  (use-fixtures :each purge-collections)

+  (deftest test-basic-single-stage-$project-aggregation-no-keywordize
+    (let [batch      [{"state" "CA" "quantity" 1 "price" 199.00}
+                      {"state" "NY" "quantity" 2 "price" 199.00}
+                      {"state" "NY" "quantity" 1 "price" 299.00}
+                      {"state" "IL" "quantity" 2 "price" 11.50 }
+                      {"state" "CA" "quantity" 2 "price" 2.95  }
+                      {"state" "IL" "quantity" 3 "price" 5.50  }]
+          expected    #{{"quantity" 1 "state" "CA"}
+                        {"quantity" 2 "state" "NY"}
+                        {"quantity" 1 "state" "NY"}
+                        {"quantity" 2 "state" "IL"}
+                        {"quantity" 2 "state" "CA"}
+                        {"quantity" 3 "state" "IL"}}]
+      (mc/insert-batch db coll batch)
+      (is (= 6 (mc/count db coll)))
+      (let [result (->>
+                     (mc/aggregate db coll [{$project {"state" 1 "quantity" 1}}] :keywordize false)
+                     (map #(select-keys % ["state" "quantity"]))
+                     (set))]
+        (is (= expected result)))))
+
  (deftest test-basic-single-stage-$project-aggregation
    (let [batch      [{:state "CA" :quantity 1 :price 199.00}
                      {:state "NY" :quantity 2 :price 199.00}
@ -109,9 +130,7 @@
  (deftest test-explain-aggregate
    (let [batch [{:state "CA" :price 100}
                 {:state "CA" :price 10}
-                 {:state "IL" :price 50}]
-          expected-keys #{:ok :stages}]
+                 {:state "IL" :price 50}]]
      (mc/insert-batch db coll batch)
-      (let [result (mc/explain-aggregate db coll [{$match {:state "CA"}}])
-            key-in-result? (partial contains? result)]
-        (is (every? key-in-result? expected-keys))))))
+      (let [result (mc/explain-aggregate db coll [{$match {:state "CA"}}])]
+        (is (:ok result))))))
--- a/test/monger/test/atomic_modifiers_test.clj
+++ b/test/monger/test/atomic_modifiers_test.clj
@ -174,7 +174,7 @@


  ;; this is a common mistake, I leave it here to demonstrate it. You almost never
-  ;; actually want to do this! What you really want is to use $pushAll instead of $push. MK.
+  ;; actually want to do this! What you really want is to use $push with $each instead of $push. MK.
  (deftest add-array-value-to-an-existing-array-using-$push-modifier
    (let [coll  "docs"
          oid   (ObjectId.)
@ -228,34 +228,34 @@
             (mc/find-map-by-id db coll oid)))))

  ;;
-  ;; $pushAll
+  ;; $push + $each (formerly $pushAll)
  ;;

-  (deftest initialize-an-array-using-$pushAll-modifier
+  (deftest initialize-an-array-using-$push-and-$each-modifiers
    (let [coll  "docs"
          oid   (ObjectId.)
          title "$pushAll modifier appends multiple values to field"]
      (mc/insert db coll {:_id oid :title title})
-      (mc/update db coll {:_id oid} {$pushAll {:tags ["mongodb" "docs"]}})
+      (mc/update db coll {:_id oid} {$push {:tags {$each ["mongodb" "docs"]}}})
      (is (= {:_id oid :title title :tags ["mongodb" "docs"]}
             (mc/find-map-by-id db coll oid)))))

-  (deftest add-value-to-an-existing-array-using-$pushAll-modifier
+  (deftest add-value-to-an-existing-array-using-$push-and-$each-modifier
    (let [coll  "docs"
          oid   (ObjectId.)
          title "$pushAll modifier appends multiple values to field"]
      (mc/insert db coll {:_id oid :title title :tags ["mongodb"]})
-      (mc/update db coll {:_id oid} {$pushAll {:tags ["modifiers" "docs"]}})
+      (mc/update db coll {:_id oid} {$push {:tags {$each ["modifiers" "docs"]}}})
      (is (= {:_id oid :title title :tags ["mongodb" "modifiers" "docs"]}
             (mc/find-map-by-id db coll oid)))))


-  (deftest double-add-value-to-an-existing-array-using-$pushAll-modifier
+  (deftest double-add-value-to-an-existing-array-using-$push-and-$each-modifier
    (let [coll  "docs"
          oid   (ObjectId.)
          title "$pushAll modifier appends multiple values to field"]
      (mc/insert db coll {:_id oid :title title :tags ["mongodb" "docs"]})
-      (mc/update db coll {:_id oid} {$pushAll {:tags ["modifiers" "docs"]}})
+      (mc/update db coll {:_id oid} {$push {:tags {$each ["modifiers" "docs"]}}})
      (is (= {:_id oid :title title :tags ["mongodb" "docs" "modifiers" "docs"]}
             (mc/find-map-by-id db coll oid)))))

--- a/test/monger/test/authentication_test.clj
+++ b/test/monger/test/authentication_test.clj
@ -15,7 +15,7 @@
      (is (-> conn .getAddress (.sameHost "127.0.0.1")))))

  (deftest ^{:authentication true} connect-to-mongo-via-uri-with-valid-credentials
-    (let [{:keys [conn db]} (mg/connect-via-uri "mongodb://clojurewerkz/monger:monger@127.0.0.1/monger-test4")]
+    (let [{:keys [conn db]} (mg/connect-via-uri "mongodb://clojurewerkz%2Fmonger:monger@127.0.0.1/monger-test4")]
      (is (= "monger-test4" (.getName db)))
      (is (-> conn .getAddress (.sameHost "127.0.0.1")))
      (mc/remove db "documents")
--- a/test/monger/test/cache_test.clj
+++ b/test/monger/test/cache_test.clj
@ -1,126 +0,0 @@
-(ns monger.test.cache-test
-  (:require [monger.core        :as mg]
-            [monger.collection  :as mc]
-            [clojure.core.cache :refer :all]
-            [clojure.test :refer :all]
-            [monger.cache :refer :all])
-  (:import [clojure.core.cache BasicCache FIFOCache LRUCache TTLCache]
-           java.util.UUID))
-
-;;
-;; Playground/Tests. These were necessary because clojure.core.cache has
-;; little documentation, incomplete test suite and
-;; slightly non-standard (although necessary to support all those cache variations)
-;; cache operations protocol.
-;;
-;; This is by no means clear or complete either but it did the job of helping me
-;; explore the API.
-
-(deftest ^{:cache true}
-  test-has?-with-basic-cache
-  (testing "that has? returns false for misses"
-    (let [c (BasicCache. {})]
-      (are [v] (is (false? (has? c v)))
-           :missing-key
-           "missing-key"
-           (gensym "missing-key"))))
-  (testing "that has? returns true for hits"
-    (let [c (BasicCache. {:skey "Value" :lkey (Long/valueOf 10000) "kkey" :keyword})]
-      (are [v] (is (has? c v))
-           :skey
-           :lkey
-           "kkey"))))
-
-
-(deftest ^{:cache true}
-  test-lookup-with-basic-cache
-  (testing "that lookup returns nil for misses"
-    (let [c (BasicCache. {})]
-      (are [v] (is (nil? (lookup c v)))
-           :missing-key
-           "missing-key"
-           (gensym "missing-key"))))
-  (testing "that lookup returns cached values for hits"
-    (let [l (Long/valueOf 10000)
-          c (BasicCache. {:skey "Value" :lkey l "kkey" :keyword})]
-      (are [v k] (is (= v (lookup c k)))
-           "Value"   :skey
-           l         :lkey
-           :keyword  "kkey"))))
-
-(deftest ^{:cache true}
-  test-evict-with-basic-cache
-  (testing "that evict has no effect for keys that do not exist"
-    (let [c (atom (BasicCache. {:a 1 :b 2}))]
-      (swap! c evict :missing-key)
-      (is (has? @c :a))
-      (is (has? @c :b))))
-  (testing "that evict removes keys that did exist"
-    (let [c (atom (BasicCache. {:skey "Value" "kkey" :keyword}))]
-      (is (has? @c :skey))
-      (is (= "Value"  (lookup @c :skey)))
-      (swap! c evict :skey)
-      (is (not (has? @c :skey)))
-      (is (= nil  (lookup @c :skey)))
-      (is (has? @c "kkey"))
-      (is (= :keyword (lookup @c "kkey"))))))
-
-(deftest ^{:cache true}
-  test-seed-with-basic-cache
-  (testing "that seed returns a new value"
-    (let [c (atom (BasicCache. {}))]
-      (swap! c seed {:a 1 :b "b" "c" :d})
-      (are [k v] (do
-                   (is (has? @c k))
-                   (is (= v (lookup @c k))))
-           :a 1
-           :b "b"
-           "c" :d))))
-
-
-;;
-;; Tests
-;;
-
-(let [conn (mg/connect)
-      db   (mg/get-db conn "monger-test")]
-  (use-fixtures :each (fn [f]
-                        (mc/remove db "basic_monger_cache_entries")
-                        (f)
-                        (mc/remove db "basic_monger_cache_entries")))
-
-
-  (deftest ^{:cache true}
-    test-has?-with-basic-monger-cache
-    (testing "that has? returns false for misses"
-      (let [coll "basic_monger_cache_entries"
-            c    (basic-monger-cache-factory db coll)]
-        (is (not (has? c (str (UUID/randomUUID)))))
-        (is (not (has? c (str (UUID/randomUUID)))))))
-    (testing "that has? returns true for hits"
-      (let [coll "basic_monger_cache_entries"
-            c    (basic-monger-cache-factory db coll {"a" 1 "b" "cache" "c" 3/4})]
-        (is (has? c "a"))
-        (is (has? c "b"))
-        (is (has? c "c"))
-        (is (not (has? c "d"))))))
-
-
-  (deftest ^{:cache true}
-    test-lookup-with-basic-monger-cache
-    (testing "that lookup returns nil for misses"
-      (let [coll "basic_monger_cache_entries"
-            c    (basic-monger-cache-factory db coll)]
-        (are [v] (is (nil? (lookup c v)))
-             :missing-key
-             "missing-key"
-             (gensym "missing-key"))))
-    (testing "that lookup returns cached values for hits"
-      (let [l (Long/valueOf 10000)
-            coll "basic_monger_cache_entries"
-            c    (basic-monger-cache-factory db coll {:skey "Value" :lkey l "kkey" :keyword})]
-        (are [v k] (is (= v (lookup c k)))
-             "Value"   :skey
-             l         :lkey
-             "keyword" "kkey")))))
-
--- a/test/monger/test/collection_test.clj
+++ b/test/monger/test/collection_test.clj
@ -134,6 +134,7 @@
                      {:state "CA" :quantity 2 :price 2.95  }
                      {:state "IL" :quantity 3 :price 5.50  }]]
      (mc/insert-batch db collection batch)
+      (is (= ["CA" "IL" "NY"] (sort (mc/distinct db collection :state))))
      (is (= ["CA" "IL" "NY"] (sort (mc/distinct db collection :state {}))))
      (is (= ["CA" "NY"] (sort (mc/distinct db collection :state {:price {$gt 100.00}}))))))

--- a/test/monger/test/conversion_test.clj
+++ b/test/monger/test/conversion_test.clj
@ -4,7 +4,8 @@
            [monger.conversion :refer :all])
  (:import [com.mongodb DBObject BasicDBObject BasicDBList]
           [java.util Date Calendar List ArrayList]
-           org.bson.types.ObjectId))
+           org.bson.types.ObjectId
+           (org.bson.types Decimal128)))


 ;;
@ -101,6 +102,13 @@
  (is (= 2 (from-db-object 2 false)))
  (is (= 2 (from-db-object 2 true))))

+(deftest convert-decimal-from-dbobject
+  (is (= 2.3M (from-db-object (Decimal128. 2.3M) false)))
+  (is (= 2.3M (from-db-object (Decimal128. 2.3M) true)))
+  (is (= 2.3M (from-db-object (Decimal128/parse "2.3") true)))
+  (is (not= 2.32M (from-db-object (Decimal128/parse "2.3") true)))
+  )
+
 (deftest convert-float-from-dbobject
  (is (= 3.3 (from-db-object 3.3 false)))
  (is (= 3.3 (from-db-object 3.3 true))))
--- a/test/monger/test/core_test.clj
+++ b/test/monger/test/core_test.clj
@ -57,16 +57,33 @@
    (is (dbs "monger-test"))))

 (deftest monger-options-test
-  (let [opts {:connections-per-host 1
-              :threads-allowed-to-block-for-connection-multiplier 1
-              :max-wait-time 1
+  (let [opts {:always-use-mbeans true
+              :application-name "app"
              :connect-timeout 1
-              :socket-timeout 1
-              :socket-keep-alive true
-              :auto-connect-retry true
-              :max-auto-connect-retry-time 1
-              :description "Description"
-              :write-concern com.mongodb.WriteConcern/JOURNAL_SAFE
+              :connections-per-host 1
              :cursor-finalizer-enabled true
-              :required-replica-set-name "rs"}]
+              :description "Description"
+              :heartbeat-connect-timeout 1
+              :heartbeat-frequency 1
+              :heartbeat-socket-timeout 1
+              :local-threshold 1
+              :max-connection-idle-time 1
+              :max-connection-life-time 1
+              :max-wait-time 1
+              :min-connections-per-host 1
+              :min-heartbeat-frequency 1
+              :required-replica-set-name "rs"
+              :retry-writes true
+              :server-selection-timeout 1
+              :socket-keep-alive true
+              :socket-timeout 1
+              :ssl-enabled true
+              :ssl-invalid-host-name-allowed true
+              :threads-allowed-to-block-for-connection-multiplier 1
+              :uuid-representation org.bson.UuidRepresentation/STANDARD
+              :write-concern com.mongodb.WriteConcern/JOURNAL_SAFE}]
    (is (instance? com.mongodb.MongoClientOptions$Builder (mg/mongo-options-builder opts)))))
+
+(deftest connect-to-uri-without-db-name
+  (let [uri "mongodb://localhost:27017"]
+    (is (thrown? IllegalArgumentException (mg/connect-via-uri uri)))))
--- a/test/monger/test/gridfs_test.clj
+++ b/test/monger/test/gridfs_test.clj
@ -78,6 +78,16 @@
                  (content-type "application/octet-stream"))
      (is (= 1 (count (gridfs/all-files fs))))))

+  (deftest ^{:gridfs true} test-deleting-file-instance-on-disk-after-storing
+    (let [tmp-file (File/createTempFile "monger.test.gridfs" "test-deleting-file-instance-on-disk-after-storing")
+          _        (spit tmp-file "to be deleted")]
+      (is (= 0 (count (gridfs/all-files fs))))
+      (store-file (make-input-file fs tmp-file)
+                  (filename "test-deleting-file-instance-on-disk-after-storing")
+                  (content-type "application/octet-stream"))
+      (is (= 1 (count (gridfs/all-files fs))))
+      (is (.delete tmp-file))))
+


  (deftest ^{:gridfs true} test-finding-individual-files-on-gridfs
--- a/test/monger/test/map_reduce_test.clj
+++ b/test/monger/test/map_reduce_test.clj
@ -1,62 +0,0 @@
-(ns monger.test.map-reduce-test
-  (:import  [com.mongodb WriteResult WriteConcern DBCursor DBObject MapReduceOutput MapReduceCommand MapReduceCommand$OutputType]
-            org.bson.types.ObjectId
-            java.util.Date)
-  (:require [monger.collection       :as mc]
-            [monger.core             :as mg]
-            [clojurewerkz.support.js :as js]
-            [clojure.test :refer :all]
-            [monger.operators :refer :all]
-            [monger.conversion :refer :all]))
-
-(let [conn (mg/connect)
-      db   (mg/get-db conn "monger-test")]
-  (use-fixtures :each (fn [f]
-                        (mc/remove db "widgets")
-                        (f)
-                        (mc/remove db "widgets")))
-
-  (let [collection "widgets"
-        mapper     (js/load-resource "resources/mongo/js/mapfun1.js")
-        reducer    "function(key, values) {
-                    var result = 0;
-                    values.forEach(function(v) { result += v });
-
-                    return result;
-                   }"
-        batch      [{ :state "CA" :quantity 1 :price 199.00 }
-                    { :state "NY" :quantity 2 :price 199.00 }
-                    { :state "NY" :quantity 1 :price 299.00 }
-                    { :state "IL" :quantity 2 :price 11.50  }
-                    { :state "CA" :quantity 2 :price 2.95   }
-                    { :state "IL" :quantity 3 :price 5.50   }]
-        expected    [{:_id "CA", :value 204.9} {:_id "IL", :value 39.5} {:_id "NY", :value 697.0}]]
-    (deftest test-basic-inline-map-reduce-example
-      (mc/remove db collection)
-      (mc/insert-batch db collection batch)
-      (let [output  (mc/map-reduce db collection mapper reducer nil MapReduceCommand$OutputType/INLINE {})
-            results (from-db-object ^DBObject (.results ^MapReduceOutput output) true)]
-        (is (= expected results))))
-
-    (deftest test-basic-map-reduce-example-that-replaces-named-collection
-      (mc/remove db collection)
-      (mc/insert-batch db collection batch)
-      (let [output  (mc/map-reduce db collection mapper reducer "mr_outputs" {})
-            results (from-db-object ^DBObject (.results ^MapReduceOutput output) true)]
-        (is (= 3 (mg/count results)))
-        (is (= expected
-               (map #(from-db-object % true) (seq results))))
-        (is (= expected
-               (map #(from-db-object % true) (mc/find db "mr_outputs"))))
-        (.drop ^MapReduceOutput output)))
-
-    (deftest test-basic-map-reduce-example-that-merged-results-into-named-collection
-      (mc/remove db collection)
-      (mc/insert-batch db collection batch)
-      (mc/map-reduce db collection mapper reducer "merged_mr_outputs" MapReduceCommand$OutputType/MERGE {})
-      (mc/insert db collection { :state "OR" :price 17.95 :quantity 4 })
-      (let [^MapReduceOutput output (mc/map-reduce db collection mapper reducer "merged_mr_outputs" MapReduceCommand$OutputType/MERGE {})]
-        (is (= 4 (mg/count output)))
-        (is (= ["CA" "IL" "NY" "OR"]
-               (map :_id (mc/find-maps db "merged_mr_outputs"))))
-        (.drop ^MapReduceOutput output)))))
--- a/test/monger/test/query_operators_test.clj
+++ b/test/monger/test/query_operators_test.clj
@ -3,10 +3,28 @@
            [monger.collection :as mc]
            [monger.js         :as js]
            [clojure.test :refer :all]
-            [monger.operators :refer :all]))
+            [clojure.set :refer [difference]]
+            [monger.operators :refer :all])
+  (:import [com.mongodb QueryOperators]))

 ;; (use-fixtures :each purge-people purge-docs purge-things purge-libraries)

+(deftest every-query-operator-is-defined
+  (let [driver-query-operators (->> (.getDeclaredFields QueryOperators) (map #(.get % nil)) set)
+        monger-query-operators (->> (ns-publics 'monger.operators) (map (comp name first)) set)
+        ; $within is deprecated and replaced by $geoWithin since v2.4.
+        ; $uniqueDocs is deprecated since v2.6.
+        deprecated-query-operators #{"$within" "$uniqueDocs"}
+        ; Query modifier operators that are deprecated in the mongo shell since v3.2
+        deprecated-meta-operators #{"$comment" "$explain" "$hint" "$maxScan"
+                                    "$maxTimeMS" "$max" "$min" "$orderby"
+                                    "$returnKey" "$showDiskLoc" "$snapshot" "$query"}
+        undefined-non-deprecated-operators (difference driver-query-operators
+                                                       deprecated-query-operators
+                                                       deprecated-meta-operators
+                                                       monger-query-operators)]
+    (is (= #{} undefined-non-deprecated-operators))))
+
 (let [conn (mg/connect)
      db   (mg/get-db conn "monger-test")]
  (defn purge-collections
@ -36,17 +54,29 @@
           2 {:users {$lte 5}}
           1 {:users {$gt 10 $lt 150}})))

+  ;;
+  ;; $eq
+  ;;
+
+  (deftest find-with-eq-operator
+    (let [collection "libraries"]
+      (mc/insert-batch db collection [{:language "Ruby"    :name "mongoid"  :users 1 :displayName nil}
+                                      {:language "Clojure" :name "langohr"  :users 5}
+                                      {:language "Clojure" :name "incanter" :users 15}
+                                      {:language "Scala"   :name "akka"     :users 150}])
+      (is (= 2 (.count (mc/find db collection {:language {$eq "Clojure"}}))))))
+
  ;;
  ;; $ne
  ;;

-  (deftest find-with-and-or-operators
+  (deftest find-with-ne-operator
    (let [collection "libraries"]
      (mc/insert-batch db collection [{:language "Ruby"    :name "mongoid"  :users 1}
                                      {:language "Clojure" :name "langohr"  :users 5}
                                      {:language "Clojure" :name "incanter" :users 15}
                                      {:language "Scala"   :name "akka"     :users 150}])
-      (is (= 2 (.count (mc/find db collection {$ne {:language "Clojure"}}))))))
+      (is (= 2 (.count (mc/find db collection {:language {$ne "Clojure"}}))))))


  ;;
@ -107,4 +137,10 @@
           {:language {$regex "clo.*" $options "i"}} 2
           {:name     {$regex "aK.*" $options "i"}} 1
           {:language {$regex ".*by"}} 1
-           {:language {$regex ".*ala.*"}} 1))))
+           {:language {$regex ".*ala.*"}} 1)))
+
+  (deftest find-with-js-expression
+    (let [collection "people"]
+      (mc/insert-batch db collection [{:name "Bob" :placeOfBirth "New York" :address {:city "New York"}}
+                                      {:name "Alice" :placeOfBirth "New York" :address {:city "Los Angeles"}}])
+      (is (= 1 (.count (mc/find db collection {$where "this.placeOfBirth === this.address.city"})))))))
--- a/test/monger/test/ragtime_test.clj
+++ b/test/monger/test/ragtime_test.clj
@ -2,7 +2,7 @@
  (:require [monger.core :as mg]
            [monger.collection  :as mc]
            monger.ragtime
-            [ragtime.core :refer :all]
+            [ragtime.protocols :refer :all]
            [clojure.test :refer :all]))


--- a/test/monger/test/result_test.clj
+++ b/test/monger/test/result_test.clj
@ -15,8 +15,11 @@
          date         (Date.)
          doc          { :created-at date :data-store "MongoDB" :language "Clojure" :_id doc-id }
          modified-doc { :created-at date :data-store "MongoDB" :language "Erlang"  :_id doc-id }]
-      (is (not (mgres/updated-existing? (mc/update db collection { :language "Clojure" } doc {:upsert true}))))
+      (let [result (mc/update db collection { :language "Clojure" } doc {:upsert true})]
+        (is (not (mgres/updated-existing? result)))
+        (is (= 1 (mgres/affected-count result))))
      (is (mgres/updated-existing? (mc/update db collection { :language "Clojure" } doc {:upsert true})))
-      (mgres/updated-existing? (mc/update db collection { :language "Clojure" } modified-doc {:multi false :upsert true}))
+      (is (mgres/updated-existing? (mc/update db collection { :language "Clojure" } modified-doc {:multi false :upsert true})))
+      (is (= 1 (mgres/affected-count (mc/remove db collection { :_id doc-id }))))
      (mc/remove db collection)
      (mg/disconnect conn))))
Author	SHA1	Message	Date
Michael Klishin	78c1a37f2e	Merge pull request #235 from quelist/fix/update-before-scripts Add MongoDB shell version detection to before scripts	2024-11-28 15:12:00 -05:00
quelist	705f4d6f47	Add MongoDB shell version detection to before scripts Update before_script.sh and before_script_docker.sh to automatically detect and use the appropriate MongoDB shell command (mongo or mongosh) based on availability. This ensures compatibility with both: - Legacy MongoDB versions using 'mongo' shell - Modern MongoDB versions (5.0+) using 'mongosh' The scripts now: - Check for command availability - Use the appropriate shell - Exit with helpful error if no shell is found	2024-11-28 12:54:54 +05:30
Michael Klishin	182a3a6f0b	Merge pull request #234 from tuliolima/feat/supporting_newer_data_json_versions Feat: supporting 3-ary clojure.data.json/write in newer versions	2024-04-07 21:30:25 -04:00
Tulio Abner de Lima	5852a5fe14	feat: supporting 3-arity clojure.data.json/write in newer versions Starting at 2.0.0, clojure.data.json implements the additional parameter `options` in `write` and other functions. The multi-arity was used in protocol extension to support older and newer versions.	2024-04-04 10:09:20 -03:00
Michael Klishin	84170f7c51	Merge pull request #224 from chrisbroome/wrap-collection-names Allow keywords as collection names in rename and aggreate	2023-01-19 08:37:42 -06:00
Michael Klishin	9f86984925	Merge pull request #226 from jzsampaio/jzsampaio-patch-1 :exclude random-uuid	2023-01-19 08:37:13 -06:00
Juarez Sampaio	92ea59ff3c	:exclude random-uuid Should prevent this message when compiling: > WARNING: random-uuid already refers to: #'clojure.core/random-uuid in namespace: monger.util, being replaced by: #'monger.util/random-uuid	2023-01-19 11:23:34 -03:00
Chris Broome	8deba612bb	Allow keywords as collection names in rename and aggreate	2022-12-01 21:59:06 -05:00
Michael Klishin	74a13a3489	Merge pull request #223 from crinklywrappr/from-db-object-perf use transients to improve `from-db-object` performance	2022-10-27 09:51:35 +04:00
Daniel Fitzpatrick	14fd0d9189	improve `from-db-object` performance by leveraging transients	2022-10-26 14:43:41 -05:00
Michael Klishin	dfe29820e1	Merge pull request #222 from crinklywrappr/add-docker-support add docker support	2022-10-25 20:52:08 +04:00
Daniel Fitzpatrick	999f6ddd9b	add docker support	2022-10-25 11:43:05 -05:00
Michael Klishin	a70fd7936a	Merge pull request #220 from jacobemcken/feature/declare_operators Avoid linter warning about unresolved operator	2022-09-09 11:55:36 +04:00
Jacob Emcken	62ef1d0727	Avoid linter warning about unresolved operator Causing the message "Unresolved var"	2022-09-09 08:20:47 +02:00
Michael Klishin	54270ad887	Merge pull request #219 from jacobemcken/feature/remove-clj-kondo-cache Avoid tracking clj-kondo cache in git history	2022-09-08 00:18:52 +04:00
Jacob Emcken	008d1ff1b0	Avoid tracking clojure-lsp cache in git history	2022-09-07 19:42:35 +02:00
Jacob Emcken	088b744991	Avoid tracking clj-kondo cache in git history	2022-09-07 18:23:51 +02:00
Michael Klishin	94cf59a53e	Merge pull request #216 from jacobemcken/cleanup/remove_warning Prevent "random-uuid already refers to" warning	2022-09-03 14:10:18 +04:00
Jacob Emcken	69bb24b3d9	Prevent "random-uuid already refers to" warning In Clojure 1.11 the function random-uuid was introduced in clojure.core causing: > WARNING: random-uuid already refers to: #'clojure.core/random-uuid in namespace: monger.util, being replaced by: #'monger.util/random-uuid	2022-09-03 08:23:13 +02:00
Michael Klishin	32407c92f1	Merge pull request #215 from punit-naik/master `insert-batch` fn docfix	2022-06-26 22:26:46 +04:00
Punit Naik	d8ce4ae787	docfix	2022-06-23 18:43:43 +05:30
Michael Klishin	dac9f83a55	Back to dev version	2022-04-23 21:56:21 +04:00
Michael Klishin	9fb211e859	3.6.0	2022-04-23 21:30:18 +04:00
Michael Klishin	b5fd0a2738	More test massaging for MongoDB server 5.x	2022-04-23 21:29:45 +04:00
Michael Klishin	30cd472e23	Remove a test ns that needs reworking for MongoDB 5.x	2022-04-23 21:10:47 +04:00
Michael Klishin	ed613dee94	Bump dependencies	2022-04-23 21:10:21 +04:00
Michael Klishin	801f08b936	Change log updates	2022-04-23 21:04:29 +04:00
Michael Klishin	4d8747f9ed	Merge pull request #213 from okorz001/uuid-representation Add uuid-representation option	2022-04-03 05:37:20 +04:00
Oscar Korz	ab878ab69c	Add uuid-representation option	2022-04-02 15:44:44 -07:00
Michael Klishin	f30a3926e0	Merge pull request #206 from robhanlon22/bump-dependencies Bump all dependency versions	2021-11-06 02:48:11 +03:00
Michael Klishin	e7c98d66e4	Merge pull request #203 from zackteo/zackteo-patch-1 Fix typo: weather to whether	2021-11-06 02:48:01 +03:00
Rob Hanlon	82ec258f6d	Add 1.9 profile to ensure back compat	2021-01-20 15:41:03 -08:00
Rob Hanlon	37c2d8433b	Bump all dependency versions	2021-01-20 15:38:20 -08:00
Zachary	0494128e15	Fix typo: weather to whether	2020-12-05 08:40:30 +08:00
Michael Klishin	9f3d192dff	Merge pull request #196 from mjrb/master update operators for MongoDB 4.2	2020-08-10 00:46:26 +03:00
Michael Klishin	1fdd62d3df	Merge pull request #186 from geuscht-m/improve-distinct-tests Add missing test case for distinct tests	2020-08-10 00:46:12 +03:00
Michael Klishin	c2cbdcaa38	Merge pull request #200 from bdrillard/mongo-options Adds missing mongo options	2020-08-10 00:45:44 +03:00
Aleksander Eskilson	37aabbe860	testing over non-objects	2020-08-09 16:03:39 -05:00
Aleksander Eskilson	010a977aac	adding mongo options	2020-08-09 16:01:20 -05:00
mjrb	b6bd6e55e2	update operators for MongoDB 4.2	2020-02-27 11:12:50 -05:00
Timo Geusch	ce6dcd27cb	Added test case for distinct to exercise non-query distinct API The existing test cases only covered the form (distinct ... :field {query}). This chance adds a test for the non-query form also.	2019-04-24 14:06:16 -07:00
Timo Geusch	a67f6de06b	Merge remote-tracking branch 'upstream/master'	2019-04-18 12:19:17 -07:00
Michael Klishin	d1b77ee3fd	Merge pull request #185 from juvenn/fix/openjdk Try to use openjdk for travis build	2019-04-12 19:59:18 +04:00
Juvenn Woo	affeb65d00	Try to use openjdk for travis build	2019-04-10 12:13:59 +08:00
Michael Klishin	37816b77a1	Merge pull request #183 from jiacai2050/master support set max-time on cursor	2019-02-28 17:44:33 +03:00
Jiacai Liu	ba29a45cc6	support set max-time on cursor	2019-02-28 16:48:06 +08:00
Michael Klishin	efc440a8f9	Change log updates	2018-12-10 15:41:15 +03:00
Michael Klishin	805383f1ec	Back to dev version	2018-12-10 15:28:35 +03:00
Michael Klishin	a3f6982a61	3.5.0	2018-12-10 15:23:54 +03:00
Michael Klishin	3a94b2a805	Move the sleep to .travis.yml Since it's only really necessary in CI scenarios.	2018-12-10 15:21:42 +03:00
Michael Klishin	1e313f990c	Change log updates	2018-12-07 20:01:09 +03:00
Michael Klishin	d6f5ac743d	Compile for JDK 8	2018-12-07 19:55:34 +03:00
Michael Klishin	85c7b84d13	Merge branch 'chrisbroome-more-meaningful-uri-exception'	2018-12-07 19:52:12 +03:00
Michael Klishin	900592e302	Cosmetics, wording	2018-12-07 19:51:59 +03:00
Chris Broome	8102c42888	TravisCI: change dist to xenial - Change distribution to `xenial` - Remove custom mongodb 4.0 installation since xenial ships with 4.0 - Increase wait time from 5 to 15 seconds	2018-12-04 23:03:14 -05:00
Chris Broome	9d34fc0231	Throw IllegalArgumentException when database name not in uri	2018-12-04 21:20:25 -05:00
Chris Broome	aa08f4b58c	Add more descriptive error message when uri has no db name	2018-12-03 22:12:45 -05:00
Michael Klishin	4b591fc910	Back to dev version	2018-12-02 22:27:46 +03:00
Michael Klishin	79bd0aabca	3.5.0-rc1	2018-12-02 22:18:53 +03:00
Michael Klishin	6bf528ed5b	Bump version to 3.5.0 There are breaking changes that reflect breaking changes in Monger's dependencies: * MongoDB server and Java client * core.cache * Ragtime While not major, they can be breaking nonetheless so let's use a greater minor version bump than usual to communicate the greater than usual number of changes.	2018-12-02 21:45:44 +03:00
Michael Klishin	318e440d0d	(c) year	2018-12-02 21:45:26 +03:00
Michael Klishin	3757c6d915	Add a 3.6.x-compatible test seed script	2018-12-02 21:42:29 +03:00
Michael Klishin	a153eb8116	Travis: provision MongoDB 4.x	2018-12-02 21:38:56 +03:00
Michael Klishin	8879e552ef	Make before_script.sh compatible with MongoDB 4.0 Note that MongoDB 3.6 doesn't recognize the mechanisms field.	2018-12-02 21:38:17 +03:00
Michael Klishin	386f06da8c	Update dependencies, adapt to new core.cache and Ragtime APIs	2018-12-02 21:24:29 +03:00
Michael Klishin	ba00ba27a5	Encode this slash in URI	2018-12-02 21:24:05 +03:00
Michael Klishin	ad2ee531a3	$pushAll is gone, replaced by $push + $each See https://docs.mongodb.com/v3.2/reference/operator/update/each/#up._S_each.	2018-12-02 21:23:20 +03:00
Michael Klishin	60c922c0a5	Merge pull request #175 from Freezystem/patch-1 Upgrade mongo drivers to 3.8.0 GA version	2018-12-01 03:49:54 +08:00
Michael Klishin	b2068fd8bb	Merge pull request #176 from seancorfield/patch-1 Add $position	2018-12-01 03:49:25 +08:00
Timo H. Geusch	595efb926f	Merge pull request #1 from michaelklishin/master Merged upstream changes	2018-11-08 15:16:44 -05:00
Sean Corfield	f6e5ff75ce	Add $position Modifier for $push	2018-08-31 17:48:25 -07:00
Nico	216674cd3d	Upgrade mongo drivers to 3.8.0 GA version I'm trying to upgrade with latest mongoDB drivers for Java. In case these drivers are breaking the tests I'll try with former `3.7.1` or `3.6.4` drivers version.	2018-07-23 14:34:48 +02:00
Michael Klishin	f093322a09	Merge pull request #171 from vadyalex/feature/aggregate-keywordize-option Add :keywordize option for aggregate that control if resulting map ke…	2018-07-23 02:37:34 +03:00
Michael Klishin	26efe88510	Merge pull request #174 from bowbahdoe/patch-1 Time passes.	2018-07-23 02:36:50 +03:00
Ethan McCue	da520112e7	Time passes.	2018-07-21 00:26:09 -04:00
Vladyslav Aleksakhin	7466db5c4d	Add :keywordize option for aggregate that control if resulting map keys will be turned into keywords, default is true.	2018-05-02 11:07:31 +02:00
Michael Klishin	89e8538d91	Drop JDK 7 tests on Travis	2018-04-10 14:29:23 +03:00
Michael Klishin	a9e1f5d7d0	Merge pull request #167 from tirkarthi/patch-1 Add JDK 9 to Travis	2018-04-10 19:29:05 +08:00
Xtreak	dc61982ced	Add JDK 9 to Travis	2018-03-17 11:12:23 +05:30
Michael Klishin	002b91d5e6	Merge pull request #164 from amitvshah25/patch-1 Update operators.clj	2018-02-15 03:28:17 +03:00
Michael Klishin	3196b66442	Merge pull request #163 from xingzhefeng/master support java Bigdecimal in mongodb 3.4 or later	2018-02-15 03:27:47 +03:00
amitvshah25	1a256a6033	Update operators.clj Added count and dateToString operators.	2017-12-14 12:58:44 -05:00
冯忠孝	20b4d5d93b	add travis-ci.org build image	2017-11-18 12:53:18 +08:00
冯忠孝	c35545a97a	update sudo apt-key adv	2017-11-18 12:46:53 +08:00
冯忠孝	15831490d9	mongodb 3.4 repo url repair	2017-11-18 12:43:22 +08:00
冯忠孝	79387a694a	This job is running on container-based infrastructure, which does not allow use of 'sudo', setuid, and setgid executables. If you require sudo, add 'sudo: required' to your .travis.yml	2017-11-18 12:36:43 +08:00
冯忠孝	993bb038d9	ci test tip No command 'lein2' found, did you mean: test mongodb version up to 3.5	2017-11-18 12:14:55 +08:00
冯忠孝	5d31f9fc1a	support java Bigdecimal in mongodb 3.4 or later	2017-11-18 11:31:45 +08:00
Michael Klishin	be43faf059	Update ChangeLog.md	2017-05-10 00:51:04 +03:00
Michael Klishin	bcaf0837b4	Merge pull request #157 from Linicks/patch-1 Update dependencies to support MongoDB 3.4.x	2017-05-10 00:48:58 +03:00
Nick	319872d5bc	Update dependencies to support MongoDB 3.4.x In order for Monger to work with MongoDB 3.4.x and higher, the Java driver must also be 3.4.x and higher. Additionally, the 3.4.x driver series will generally work with Java version 6.x, it requires 7.x, and even 8.x for specific SSL functions that are needed by some "Platform As A Service" providers such as MongoDB Atlas. Here are some relevant links that provide some additional details: - http://mongodb.github.io/mongo-java-driver/3.4/upgrading/ - https://docs.atlas.mongodb.com/driver-connection/#java-driver-example - http://mongodb.github.io/mongo-java-driver/?_ga=2.85301265.905224850.1494354505-76319364.1488584191	2017-05-09 14:32:25 -07:00
Michael Klishin	6e333bb563	Merge pull request #154 from haines/fix-clojure-1.9-warning Exclude clojure.core/any? to prevent warnings on Clojure 1.9	2017-02-10 19:04:48 +03:00
Andrew Haines	1ca1469126	Exclude clojure.core/any? to prevent warnings on Clojure 1.9	2017-02-10 15:21:02 +00:00
Michael Klishin	f3d8a7bb71	Merge pull request #153 from eunmin/add-affected-count Add affected-count function for WriteResult	2017-01-11 13:09:46 +08:00
eunmin	99a113e220	Add affected-count function for WriteResult	2017-01-11 13:45:49 +09:00
Michael Klishin	c1acd78060	Merge pull request #150 from frooeyzanny/fix-pullAll-example Fix $pullAll example	2016-11-20 19:44:11 +03:00
Michael Klishin	62dc2a9cd3	Merge pull request #149 from frooeyzanny/fix-subtract-operator substract -> subtract	2016-11-20 19:43:54 +03:00
Michael Klishin	5b5425c402	Merge pull request #144 from caligin/master fix: missing overload in :arglists, was causing eastwood to complain about correct calls	2016-11-20 19:43:27 +03:00
Michael Klishin	34671dcd5d	Merge pull request #148 from jokimaki/close-stream-on-persist Close GridFSInputFile input stream on persist	2016-11-20 19:43:03 +03:00
Juha Jokimaki	1170f342dd	Delegate stream creation to GridFS	2016-11-20 18:03:11 +02:00
Evgeny Samsonov	27ed7bdfb7	Fix pullAll example	2016-11-02 18:14:31 +03:00
Evgeny Samsonov	517bb98129	substract -> subtract	2016-11-02 18:00:05 +03:00
Juha Jokimaki	b1cfb5490a	Set GridFSInputFile closeStreamOnPersist flag	2016-10-31 08:52:14 +02:00
Michael Klishin	f499079bf7	Merge pull request #147 from jokimaki/operators Add missing operators	2016-10-30 22:52:35 +03:00
Juha Jokimaki	0d7dc9357a	Add $isolated operator	2016-10-30 18:15:51 +02:00
Juha Jokimaki	82c76dd66d	Add $eq operator	2016-10-30 18:06:49 +02:00
Juha Jokimaki	2021c6d07f	Fix $ne operator usage The flaw was exposed when the test name was fixed.	2016-10-30 17:49:32 +02:00
Juha Jokimaki	3d4a38a10a	Fix test name to match what is tested	2016-10-30 17:31:16 +02:00
Juha Jokimaki	8fd4946959	Add $where operator	2016-10-30 17:21:15 +02:00
Juha Jokimaki	08ce1e41b3	Add missing geospatial operators	2016-10-30 16:54:46 +02:00
Juha Jokimaki	a2bc59dcfa	Test that every query operator is defined	2016-10-30 16:52:52 +02:00
Michael Klishin	d0fc0ed528	alpha13 is out	2016-10-10 00:17:01 +03:00
Fulvio Meden	57464ac592	fix: missing overload in :arglists, was causing eastwood to complain about correct calls	2016-10-04 14:24:19 +01:00
Michael Klishin	0f2a44179d	3.1.0 is out	2016-09-17 03:29:39 +03:00
Michael Klishin	7721c83ccf	Update change log	2016-09-17 03:29:21 +03:00
Michael Klishin	c374e7593b	Back to dev version	2016-09-17 03:28:45 +03:00