Skip to content

Commit fec48e2

Browse files
Update query
1 parent ec446a5 commit fec48e2

File tree

5 files changed

+290
-131
lines changed

5 files changed

+290
-131
lines changed

package-lock.json

+50-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

query.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
};
9393
}
9494
var filter = new Query.Query(constraints, getter);
95-
return rows.filter(filter);
95+
return (rows||[]).filter(filter);
9696
},
9797

9898
lhs: { // queries that are not yet referenced to a particular attribute, e.g. {$not: {likes: 0}}
@@ -121,12 +121,10 @@
121121
* @returns {*}
122122
*/
123123
$count: function (row, condition, getter) {
124-
125-
var res = condition.$constraints.map(function (c) {
124+
let subconditions = condition.$conditions || condition.$constraints
125+
var res = subconditions.map(function (c) {
126126
return Query.satisfies(row, c, getter);
127-
}).filter(function (v) {
128-
return v
129-
}).length
127+
}).filter(function (v) {return v}).length
130128
return this.rhs._satisfies(res, condition.$constraint)
131129
},
132130

0 commit comments

Comments
 (0)