Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #7458: Nested $and not working in pouchdb-find. #7505

Merged
merged 4 commits into from
Nov 19, 2018
Merged

Issue #7458: Nested $and not working in pouchdb-find. #7505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
344824a
Issue #7458: Nested $and not working in pouchdb-find.
Oct 30, 2018
64f92a5
fixing missing semicolon
Nov 5, 2018
7697ba6
adding more tests
Nov 12, 2018
a2db098
fixing tests and const
Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 39 additions & 4 deletions packages/node_modules/pouchdb-selector-core/src/utils.js
View file
Open in desktop
Expand Up @@ -196,17 +196,52 @@ function mergeEq(value, fieldMatchers) {
fieldMatchers.$eq = value;
}

//#7458: execute function mergeAndedSelectors on nested $and
function mergeAndedSelectorsNested(obj) {
for (var prop in obj) {
if (Array.isArray(obj)) {
for (var i in obj) {
if (obj[i]['$and']) {
obj[i] = mergeAndedSelectors(obj[i]['$and']);
}
}
}
var value = obj[prop];
if (typeof value === 'object') {
mergeAndedSelectorsNested(value); // <- recursive call
}
}
return obj;
}

//#7458: determine id $and is present in selector (at any level)
function isAndInSelector(obj, isAnd) {
for (var prop in obj) {
if (prop === '$and') {
isAnd = true;
}
var value = obj[prop];
if (typeof value === 'object') {
isAnd = isAndInSelector(value, isAnd); // <- recursive call
}
}
return isAnd;
}

//
// normalize the selector
//
function massageSelector(input) {
var result = clone(input);
var wasAnded = false;
if ('$and' in result) {
result = mergeAndedSelectors(result['$and']);
wasAnded = true;
}
//#7458: if $and is present in selector (at any level) merge nested $and
if (isAndInSelector(result, false)) {
result = mergeAndedSelectorsNested(result);
if ('$and' in result) {
result = mergeAndedSelectors(result['$and']);
}
wasAnded = true;
}

['$or', '$nor'].forEach(function (orOrNor) {
if (orOrNor in result) {
Expand Down
72 changes: 72 additions & 0 deletions tests/find/test-suite-1/test.and.js
View file
Open in desktop
Expand Up @@ -72,5 +72,77 @@ testCases.push(function (dbType, context) {
});
});

it('does nested and for _id', function () {
var db = context.db;
return db.bulkDocs([
{ name: 'mario', _id: 'mario', rank: 5, series: 'mario', debut: 1981 },
{ name: 'jigglypuff', _id: 'puff', rank: 8, series: 'pokemon', debut: 1996 },
{ name: 'link', rank: 10, _id: 'link', series: 'zelda', debut: 1986 },
{ name: 'donkey kong', rank: 7, _id: 'dk', series: 'mario', debut: 1981 },
{ name: 'pikachu', series: 'pokemon', _id: 'pikachu', rank: 1, debut: 1996 },
{ name: 'captain falcon', _id: 'falcon', rank: 4, series: 'f-zero', debut: 1990 },
{ name: 'luigi', rank: 11, _id: 'luigi', series: 'mario', debut: 1983 },
{ name: 'fox', _id: 'fox', rank: 3, series: 'star fox', debut: 1993 },
{ name: 'ness', rank: 9, _id: 'ness', series: 'earthbound', debut: 1994 },
{ name: 'samus', rank: 12, _id: 'samus', series: 'metroid', debut: 1986 },
{ name: 'yoshi', _id: 'yoshi', rank: 6, series: 'mario', debut: 1990 },
{ name: 'kirby', _id: 'kirby', series: 'kirby', rank: 2, debut: 1992 }
]).then(function () {
return db.find({
selector: {$and: [
{debut: {$eq: 1996}},
{$and: [
{rank: {$eq: 8}},
{name: {$eq: 'jigglypuff'}}
]}
]},
fields: ["_id"],
});
}).then(function (resp) {
resp.docs.should.deep.equal([
{_id: 'puff'},
]);
});
});

it('does nested and for index', function () {
var db = context.db;
var index = {
"index": {
"fields": ["debut"]
}
};
return db.createIndex(index).then(function () {
return db.bulkDocs([
{ name: 'mario', _id: 'mario', rank: 5, series: 'mario', debut: 1981 },
{ name: 'jigglypuff', _id: 'puff', rank: 8, series: 'pokemon', debut: 1996 },
{ name: 'link', rank: 10, _id: 'link', series: 'zelda', debut: 1986 },
{ name: 'donkey kong', rank: 7, _id: 'dk', series: 'mario', debut: 1981 },
{ name: 'pikachu', series: 'pokemon', _id: 'pikachu', rank: 1, debut: 1996 },
{ name: 'captain falcon', _id: 'falcon', rank: 4, series: 'f-zero', debut: 1990 },
{ name: 'luigi', rank: 11, _id: 'luigi', series: 'mario', debut: 1983 },
{ name: 'fox', _id: 'fox', rank: 3, series: 'star fox', debut: 1993 },
{ name: 'ness', rank: 9, _id: 'ness', series: 'earthbound', debut: 1994 },
{ name: 'samus', rank: 12, _id: 'samus', series: 'metroid', debut: 1986 },
{ name: 'yoshi', _id: 'yoshi', rank: 6, series: 'mario', debut: 1990 },
{ name: 'kirby', _id: 'kirby', series: 'kirby', rank: 2, debut: 1992 }
]);}).then(function () {
return db.find({
selector: {$and: [
{debut: {$eq: 1996}},
{$and: [
{rank: {$eq: 8}},
{name: {$eq: 'jigglypuff'}}
]}
]},
fields: ["_id"],
});
}).then(function (resp) {
resp.docs.should.deep.equal([
{_id: 'puff'},
]);
});
});

});
});
178 changes: 116 additions & 62 deletions tests/find/test-suite-1/test.or.js
View file
Open in desktop
@@ -1,72 +1,126 @@
'use strict';

testCases.push(function (dbType, context) {
describe(dbType + ': test.or.js', function () {
describe(dbType + ': test.or.js', function () {

beforeEach(function () {
return context.db.bulkDocs([
{ name: 'Mario', _id: 'mario', rank: 5, series: 'Mario', debut: 1981, awesome: true },
{ name: 'Jigglypuff', _id: 'puff', rank: 8, series: 'Pokemon', debut: 1996,
awesome: false },
{ name: 'Link', rank: 10, _id: 'link', series: 'Zelda', debut: 1986, awesome: true },
{ name: 'Donkey Kong', rank: 7, _id: 'dk', series: 'Mario', debut: 1981, awesome: false },
{ name: 'Pikachu', series: 'Pokemon', _id: 'pikachu', rank: 1, debut: 1996, awesome: true },
{ name: 'Captain Falcon', _id: 'falcon', rank: 4, series: 'F-Zero', debut: 1990,
awesome: true },
{ name: 'Luigi', rank: 11, _id: 'luigi', series: 'Mario', debut: 1983, awesome: false },
{ name: 'Fox', _id: 'fox', rank: 3, series: 'Star Fox', debut: 1993, awesome: true },
{ name: 'Ness', rank: 9, _id: 'ness', series: 'Earthbound', debut: 1994, awesome: true },
{ name: 'Samus', rank: 12, _id: 'samus', series: 'Metroid', debut: 1986, awesome: true },
{ name: 'Yoshi', _id: 'yoshi', rank: 6, series: 'Mario', debut: 1990, awesome: true },
{ name: 'Kirby', _id: 'kirby', series: 'Kirby', rank: 2, debut: 1992, awesome: true },
{ name: 'Master Hand', _id: 'master_hand', series: 'Smash Bros', rank: 0, debut: 1999,
awesome: false }
]);
});
beforeEach(function () {
return context.db.bulkDocs([
{ name: 'Mario', _id: 'mario', rank: 5, series: 'Mario', debut: 1981, awesome: true },
{ name: 'Jigglypuff', _id: 'puff', rank: 8, series: 'Pokemon', debut: 1996,
awesome: false },
{ name: 'Link', rank: 10, _id: 'link', series: 'Zelda', debut: 1986, awesome: true },
{ name: 'Donkey Kong', rank: 7, _id: 'dk', series: 'Mario', debut: 1981, awesome: false },
{ name: 'Pikachu', series: 'Pokemon', _id: 'pikachu', rank: 1, debut: 1996, awesome: true },
{ name: 'Captain Falcon', _id: 'falcon', rank: 4, series: 'F-Zero', debut: 1990,
awesome: true },
{ name: 'Luigi', rank: 11, _id: 'luigi', series: 'Mario', debut: 1983, awesome: false },
{ name: 'Fox', _id: 'fox', rank: 3, series: 'Star Fox', debut: 1993, awesome: true },
{ name: 'Ness', rank: 9, _id: 'ness', series: 'Earthbound', debut: 1994, awesome: true },
{ name: 'Samus', rank: 12, _id: 'samus', series: 'Metroid', debut: 1986, awesome: true },
{ name: 'Yoshi', _id: 'yoshi', rank: 6, series: 'Mario', debut: 1990, awesome: true },
{ name: 'Kirby', _id: 'kirby', series: 'Kirby', rank: 2, debut: 1992, awesome: true },
{ name: 'Master Hand', _id: 'master_hand', series: 'Smash Bros', rank: 0, debut: 1999,
awesome: false }
]);
});

it('#6366 should do a basic $or', function () {
var db = context.db;
return db.find({
selector: {
"$or": [
{ "name": "Link" },
{ "name": "Mario" }
]
}
}).then(function (res) {
var docs = res.docs.map(function (doc) {
return {
_id: doc._id
};
it('#6366 should do a basic $or', function () {
var db = context.db;
return db.find({
selector: {
"$or": [
{ "name": "Link" },
{ "name": "Mario" }
]
}
}).then(function (res) {
var docs = res.docs.map(function (doc) {
return {
_id: doc._id
};
});
docs.should.deep.equal([
{'_id': 'link'},
{'_id': 'mario'},
]);
});
});
docs.should.deep.equal([
{'_id': 'link'},
{'_id': 'mario'},
]);
});
});

it('#6366 should do a basic $or, with explicit $eq', function () {
var db = context.db;
return db.find({
selector: {
"$or": [
{ "name": {$eq: "Link"} },
{ "name": {$eq: "Mario"} }
]
}
}).then(function (res) {
var docs = res.docs.map(function (doc) {
return {
_id: doc._id
};
it('#6366 should do a basic $or, with explicit $eq', function () {
var db = context.db;
return db.find({
selector: {
"$or": [
{ "name": {$eq: "Link"} },
{ "name": {$eq: "Mario"} }
]
}
}).then(function (res) {
var docs = res.docs.map(function (doc) {
return {
_id: doc._id
};
});
docs.should.deep.equal([
{'_id': 'link'},
{'_id': 'mario'},
]);
});
});
docs.should.deep.equal([
{'_id': 'link'},
{'_id': 'mario'},
]);
});
});

});
it('#7458 should do $or with nested $and', function () {
var db = context.db;
return db.find({
selector: {
"$or": [
{ "name": {$eq: "Link"} },
{
"$and": [
{"name": "Mario"},
{"rank": 5}
]
}
]
}
}).then(function (res) {
var docs = res.docs.map(function (doc) {
return {
_id: doc._id
};
});
docs.should.deep.equal([
{'_id': 'link'},
{'_id': 'mario'},
]);
});
});

it('#7458 should do $or with nested $and, with explicit $eq', function () {
var db = context.db;
return db.find({
selector: {
"$or": [
{ "name": {$eq: "Link"} },
{
"$and": [
{"name": {$eq: "Mario"}},
{"rank": {$eq: 5}}
]
}
]
}
}).then(function (res) {
var docs = res.docs.map(function (doc) {
return {
_id: doc._id
};
});
docs.should.deep.equal([
{'_id': 'link'},
{'_id': 'mario'},
]);
});
});

});
});