DOCS-7898: mongoexport and strict json fmt date

Author: kay-kim

source/includes/fact-quote-command-line-query.rst

@@ -1,2 +1,2 @@
-You must enclose the query in single quotes (e.g. ``'``) to ensure that it does
+You must enclose the query document in single quotes (``'{ ... }'``) to ensure that it does
 not interact with your shell environment.

source/includes/options-mongoexport.yaml

@@ -228,8 +228,8 @@ aliases: -q
 directive: option
 args: <JSON>
 description: |
-  Provides a :term:`JSON document` as a query that optionally limits
-  the documents returned in the export. Specify JSON in :doc:`strict
+  Provides a query as a :term:`JSON document` (enclosed in quotes) to 
+  return matching documents in the export. Specify JSON in :doc:`strict
   format </reference/mongodb-extended-json>`.
 
   .. include:: /includes/fact-quote-command-line-query.rst
@@ -239,26 +239,29 @@ description: |
 
   .. code:: json
 
-     { "_id" : ObjectId("51f0188846a64a1ed98fde7c"), "a" : 1 }
-     { "_id" : ObjectId("520e61b0c6646578e3661b59"), "a" : 1, "b" : 2 }
-     { "_id" : ObjectId("520e642bb7fa4ea22d6b1871"), "a" : 2, "b" : 3, "c" : 5 }
-     { "_id" : ObjectId("520e6431b7fa4ea22d6b1872"), "a" : 3, "b" : 3, "c" : 6 }
-     { "_id" : ObjectId("520e6445b7fa4ea22d6b1873"), "a" : 5, "b" : 6, "c" : 8 }
+     { "_id" : ObjectId("51f0188846a64a1ed98fde7c"), "a" : 1, "date" : ISODate("1960-05-01T00:00:00Z") }
+     { "_id" : ObjectId("520e61b0c6646578e3661b59"), "a" : 1, "b" : 2, "date" : ISODate("1970-05-01T00:00:00Z") }
+     { "_id" : ObjectId("520e642bb7fa4ea22d6b1871"), "a" : 2, "b" : 3, "c" : 5, "date" : ISODate("2010-05-01T00:00:00Z") }
+     { "_id" : ObjectId("520e6431b7fa4ea22d6b1872"), "a" : 3, "b" : 3, "c" : 6, "date" : ISODate("2015-05-02T00:00:00Z") }
+     { "_id" : ObjectId("520e6445b7fa4ea22d6b1873"), "a" : 5, "b" : 6, "c" : 8, "date" : ISODate("2018-03-01T00:00:00Z") }
+     { "_id" : ObjectId("5cd0de910dbce4346295ae28"), "a" : 15, "b" : 5, "date" : ISODate("2015-03-01T00:00:00Z") }
 
   The following :binary:`~bin.mongoexport` uses the :option:`-q` option to
   export only the documents with the field ``a`` greater than or equal to
-  (:query:`$gte`) to ``3``:
+  (:query:`$gte`) to ``3`` and the field ``date`` less than  
+  ``ISODate("2016-01-01T00:00:00Z")`` (using the :ref:`strict format
+  for dates { "$date": "YYYY-MM-DDTHH:mm:ss.mmm\<offset\>"} <extended-json-date>`):
 
   .. code:: bash
 
-     mongoexport -d test -c records -q '{ a: { $gte: 3 } }' --out exportdir/myRecords.json
+     mongoexport -d test -c records -q '{ a: { $gte: 3 }, date: { $lt: { "$date": "2016-01-01T00:00:00.000Z" } } }' --out exportdir/myRecords.json
 
   The resulting file contains the following documents:
 
   .. code:: json
 
-     { "_id" : { "$oid" : "520e6431b7fa4ea22d6b1872" }, "a" : 3, "b" : 3, "c" : 6 }
-     { "_id" : { "$oid" : "520e6445b7fa4ea22d6b1873" }, "a" : 5, "b" : 6, "c" : 8 }
+     {"_id":{"$oid":"520e6431b7fa4ea22d6b1872"},"a":3.0,"b":3.0,"c":6.0,"date":{"$date":"2015-05-02T00:00:00Z"}}
+     {"_id":{"$oid":"5cd0de910dbce4346295ae28"},"a":15.0,"b":5.0,"date":{"$date":"2015-03-01T00:00:00Z"}}
 
   You can sort the results with the :option:`--sort` option to
   :binary:`~bin.mongoexport`.

source/reference/mongodb-extended-json.txt

@@ -109,6 +109,8 @@ Binary
   *Strict mode* it is a hexadecimal string, and in *Shell mode* it is an integer.
   See the extended bson documentation. http://bsonspec.org/spec.html
 
+.. _extended-json-date:
+
 Date
 ~~~~
 
@@ -137,15 +139,6 @@ Date
    In *Strict mode*, ``<date>`` is an ISO-8601 date format with a mandatory time
    zone field following the template ``YYYY-MM-DDTHH:mm:ss.mmm<+/-Offset>``.
 
-   The MongoDB JSON parser currently does not support loading ISO-8601 strings
-   representing dates prior to the :term:`Unix epoch`. When formatting
-   pre-epoch dates and dates past what your system's ``time_t`` type can hold,
-   the following format is used:
-
-   .. code-block:: none
-
-      { "$date" : { "$numberLong" : "<dateAsMilliseconds>" } }
-
    In *Shell mode*, ``<date>`` is the JSON representation of a 64-bit signed
    integer giving the number of milliseconds since epoch UTC.
 

source/reference/program/mongoexport.txt

@@ -252,29 +252,60 @@ writes the export to the ``contacts.json`` file in :term:`JSON` format.
 Export from Remote Host Running with Authentication
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following example exports the ``contacts`` collection from the
-``marketing`` database, which requires authentication.
+The following example exports the ``contacts`` collection in the
+``marketing`` database from a remote MongoDB instance that requires
+authentication.
 
-This data resides on the MongoDB instance located on the host
-``mongodb1.example.net`` running on port ``37017``, which requires the username
-``user`` and the password ``pass``.
+Specify the:
+
+- :option:`--host <mongoexport --host>`
+
+- :option:`--port <mongoexport --port>`
+
+- :option:`--username <mongoexport --username>`
+
+- :option:`--authenticationDatabase <mongoexport --authenticationDatabase>`
+
+- :option:`--collection <mongoexport --collection>`
+
+- :option:`--db <mongoexport --db>`
+
+- :option:`--out <mongoexport --out>`
+
+.. tip::
+
+   Omit the :option:`--password <mongoexport --password>` option to
+   have ``mongoexport`` prompt for the password:
+
+.. code-block:: sh
+
+   mongoexport --host mongodb1.example.net --port 27017 --username someUser --authenticationDatabase admin 
+
+Alternatively, you use the :option:`--uri <mongoexport --uri>` option to specify the host, port, username, authentication database, and db.
+
+.. tip::
+
+   Omit the password in the URI string to have ``mongoexport`` prompt
+   for the password:
 
 .. code-block:: sh
 
-   mongoexport --host mongodb1.example.net --port 37017 --username user --password "pass" --collection contacts --db marketing --out mdb1-examplenet.json
+   mongoexport --uri 'mongodb://someUser@mongodb0.example.com:27017/marketing?authsource=admin' --collection contacts --out mdb1-examplenet.json
 
 Export Query Results
 ~~~~~~~~~~~~~~~~~~~~
 You can export only the results of a query by supplying a query filter with
 the :option:`--query <mongoexport --query>` option, and limit the results to a single
 database using the ":option:`--db <mongoexport --db>`" option.
 
-For instance, this command returns all documents in the ``sales`` database's
-``contacts`` collection that contain a field named ``field`` with a value
-of ``1``.
+For instance, this command returns all documents in the ``sales``
+database's ``contacts`` collection that contain a field named ``dept``
+equal to ``"ABC"`` and the field ``date`` greater than or equal to
+ISODate("2018-01-01") (using the :ref:`strict format for dates
+{ "$date": "YYYY-MM-DDTHH:mm:ss.mmm\<offset\>"} <extended-json-date>` )
 
 .. code-block:: sh
 
-   mongoexport --db sales --collection contacts --query '{"field": 1}'
+   mongoexport --db sales --collection contacts --query '{"dept": "ABC", date: { $gte: { "$date": "2018-01-01T00:00:00.000Z" } }}'
 
 .. include:: /includes/fact-quote-command-line-query.rst