docs updated

diff --git a/README.md b/README.md
index e09a3c5..b2bc2e8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ JSON representation of queries and data implemented with API based on [C BSON](h
 
 News
 ===============================
+* `2013-08-08` **[Now supported $and & $or mongodb operators] (https://github.com/Softmotions/ejdb/issues/81)**
 * `2013-07-15` **[Google Go binding] (https://github.com/mkilling/goejdb)**
 * `2013-06-23` **[C# .Net binding] (https://github.com/Softmotions/ejdb/tree/master/nejdb)**
 * `2013-06-02` **[Adobe Air Native Extension (ANE) for EJDB (Thanks to @thejustinwalsh)] (https://github.com/thejustinwalsh/airejdb)**
@@ -531,6 +532,10 @@ Queries
  *     - $elemMatch The $elemMatch operator matches more than one component within an array element.
  *          -  { array: { $elemMatch: { value1 : 1, value2 : { $gt: 1 } } } }
  *          Restriction: only one $elemMatch allowed in context of one array field.
+ *      - $and, $or joining:
+ *          -   {..., $and : [subq1, subq2, ...] }
+ *          -   {..., $or  : [subq1, subq2, ...] }
+ *          Example: {z : 33, $and : [ {$or : [{a : 1}, {b : 2}]}, {$or : [{c : 5}, {d : 7}]} ] }
  *
  *  - Queries can be used to update records:
  *       $set Field set operation.

diff --git a/node/README.md b/node/README.md
index 13d1d69..5613828 100644 (file)
--- a/node/README.md
+++ b/node/README.md
@@ -208,6 +208,10 @@ EJDB queries inspired by MongoDB (mongodb.org) and follows same philosophy.
       - $elemMatch The $elemMatch operator matches more than one component within an array element.
           -  { array: { $elemMatch: { value1 : 1, value2 : { $gt: 1 } } } }
           Restriction: only one $elemMatch allowed in context of one array field.
+      - $and, $or joining:
+          -   {..., $and : [subq1, subq2, ...] }
+          -   {..., $or  : [subq1, subq2, ...] }
+          Example: {z : 33, $and : [ {$or : [{a : 1}, {b : 2}]}, {$or : [{c : 5}, {d : 7}]} ] }
 
       - Queries can be used to update records:
 

diff --git a/node/ejdb.js b/node/ejdb.js
index fe5a764..2d38624 100644 (file)
--- a/node/ejdb.js
+++ b/node/ejdb.js
@@ -320,6 +320,10 @@ function parseQueryArgs(args) {
  *      - $elemMatch The $elemMatch operator matches more than one component within an array element.
  *          -    { array: { $elemMatch: { value1 : 1, value2 : { $gt: 1 } } } }
  *          Restriction: only one $elemMatch allowed in context of one array field.
+ *      - $and, $or joining:
+ *          -   {..., $and : [subq1, subq2, ...] }
+ *          -   {..., $or  : [subq1, subq2, ...] }
+ *          Example: {z : 33, $and : [ {$or : [{a : 1}, {b : 2}]}, {$or : [{c : 5}, {d : 7}]} ] }
  *
  *  - Queries can be used to update records:
  *

diff --git a/pyejdb/pyejdb/__init__.py b/pyejdb/pyejdb/__init__.py
index a5adeda..dbde047 100644 (file)
--- a/pyejdb/pyejdb/__init__.py
+++ b/pyejdb/pyejdb/__init__.py
@@ -332,6 +332,10 @@ class EJDB(object):
            - $elemMatch The $elemMatch operator matches more than one component within an array element.
                -    { array: { $elemMatch: { value1 : 1, value2 : { $gt: 1 } } } }
                Restriction: only one $elemMatch allowed in context of one array field.
+           - $and, $or joining:
+               -   {..., $and : [subq1, subq2, ...] }
+               -   {..., $or  : [subq1, subq2, ...] }
+              Example: {z : 33, $and : [ {$or : [{a : 1}, {b : 2}]}, {$or : [{c : 5}, {d : 7}]} ] }
 
         - Queries can be used to update records:
 

diff --git a/tcejdb/ejdb.h b/tcejdb/ejdb.h
index b0c00b1..92770ce 100644 (file)
--- a/tcejdb/ejdb.h
+++ b/tcejdb/ejdb.h
@@ -294,6 +294,10 @@ EJDB_EXPORT bson* ejdbloadbson(EJCOLL *coll, const bson_oid_t *oid);
  *      - $elemMatch The $elemMatch operator matches more than one component within an array element.
  *          -    { array: { $elemMatch: { value1 : 1, value2 : { $gt: 1 } } } }
  *          Restriction: only one $elemMatch allowed in context of one array field.
+ *      - $and, $or joining:
+ *          -   {..., $and : [subq1, subq2, ...] }
+ *          -   {..., $or  : [subq1, subq2, ...] }
+ *          Example: {z : 33, $and : [ {$or : [{a : 1}, {b : 2}]}, {$or : [{c : 5}, {d : 7}]} ] }
  *
  *  - Queries can be used to update records:
  *