diff options
| author | adam <adamansky@gmail.com> | 2013-08-07 22:20:30 +0700 |
|---|---|---|
| committer | adam <adamansky@gmail.com> | 2013-08-07 22:20:30 +0700 |
| commit | 968a951768240524f17fefa4eeb0a44550730dd5 (patch) | |
| tree | 617961e288b2c9227aecbfd460bc6cae52a71f15 /tcejdb | |
| parent | d5924bf3c850b7dd78730cda5e927dd660812b04 (diff) | |
| download | ejdb-968a951768240524f17fefa4eeb0a44550730dd5.tar.gz ejdb-968a951768240524f17fefa4eeb0a44550730dd5.tar.bz2 ejdb-968a951768240524f17fefa4eeb0a44550730dd5.zip | |
#81
Diffstat (limited to 'tcejdb')
| -rw-r--r-- | tcejdb/ejdb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tcejdb/ejdb.c b/tcejdb/ejdb.c index b1a3914..9914574 100644 --- a/tcejdb/ejdb.c +++ b/tcejdb/ejdb.c @@ -2947,7 +2947,7 @@ static TCLIST* _qryexecute(EJCOLL *jcoll, const EJQ *q, uint32_t *outcount, int if (!(ejq->flags & EJQONLYCOUNT) && (all || count > skip)) { \ _pushprocessedbson(jb, ejq, res, dfields, ifields, imode, (_bsbuf), (_bsbufsz)); \ } - //EOF #define JBQREGREC +//EOF #define JBQREGREC bool trim = (midx && *midx->name != '\0'); if (anum > 0 && !(mqf->flags & EJFEXCLUDED)) { @@ -4215,7 +4215,9 @@ static int _parse_qobj_impl(EJDB *jb, EJQ *q, bson_iterator *it, TCLIST *qlist, tclistpush2(pathStack, fkey); qf.ftype = ftype; } else { - if (!strcmp("$set", fkey) || + if (!strcmp("$or", fkey)) { //Both levels operators. + // + } else if (!strcmp("$set", fkey) || !strcmp("$inc", fkey) || !strcmp("$dropall", fkey) || !strcmp("$addToSet", fkey) || @@ -4223,8 +4225,7 @@ static int _parse_qobj_impl(EJDB *jb, EJQ *q, bson_iterator *it, TCLIST *qlist, !strcmp("$upsert", fkey) || !strcmp("$pull", fkey) || !strcmp("$pullAll", fkey) || - !strcmp("$do", fkey) || - !strcmp("$or", fkey) + !strcmp("$do", fkey) ) { if (pqf) { //Top level ops ret = JBEQERROR; @@ -4267,7 +4268,8 @@ static int _parse_qobj_impl(EJDB *jb, EJQ *q, bson_iterator *it, TCLIST *qlist, if (bt != BSON_OBJECT) { continue; } - if (ejdbqueryaddor(jb, q, bson_iterator_value(&sit)) == NULL) { + EJQ *oq = (pqf != NULL) ? pqf->q : q; + if (ejdbqueryaddor(jb, oq, bson_iterator_value(&sit)) == NULL) { break; } } |