Skip to content

Adds support for like/notLike and contains/notContains operators #12

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adds support for like/notLike and contains/notContains operators #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4731af5
Adds support for like/notLike and contains/notContains
recipher Sep 22, 2015
591858d
Updated findAll specs for like/notLike, contains/notContains to use g…
recipher Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions dist/js-data-rethinkdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,16 @@ module.exports =
subQuery = subQuery ? subQuery.and(row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().eq(0)) : row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().eq(0);
} else if (op === 'isectNotEmpty') {
subQuery = subQuery ? subQuery.and(row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().ne(0)) : row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().ne(0);
} else if (op === 'like') {
v = '(i?)' + v; // Case-insensitive
subQuery = subQuery ? subQuery.and(row(field)['default'](null).match(v)) : row(field)['default'](null).match(v);
} else if (op === 'notLike') {
v = '(i?)' + v; // Case-insensitive
subQuery = subQuery ? subQuery.and(row(field)['default'](null).match(v).not()) : row(field)['default'](null).match(v).not();
} else if (op === 'contains') {
subQuery = subQuery ? subQuery.and(row(field)['default']([]).contains(r.expr(v)['default'](null))) : row(field)['default']([]).contains(r.expr(v)['default'](null));
} else if (op === 'notContains') {
subQuery = subQuery ? subQuery.and(row(field)['default']([]).contains(r.expr(v)['default'](null)).not()) : row(field)['default']([]).contains(r.expr(v)['default'](null)).not();
} else if (op === 'in') {
subQuery = subQuery ? subQuery.and(r.expr(v)['default'](r.expr([])).contains(row(field)['default'](null))) : r.expr(v)['default'](r.expr([])).contains(row(field)['default'](null));
} else if (op === 'notIn') {
Expand All @@ -168,6 +178,16 @@ module.exports =
subQuery = subQuery ? subQuery.or(row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().eq(0)) : row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().eq(0);
} else if (op === '|isectNotEmpty') {
subQuery = subQuery ? subQuery.or(row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().ne(0)) : row(field)['default']([]).setIntersection(r.expr(v)['default']([])).count().ne(0);
} else if (op === '|like') {
v = '(i?)' + v; // Case-insensitive
subQuery = subQuery ? subQuery.or(row(field)['default'](null).match(v)) : row(field)['default'](null).match(v);
} else if (op === '|notLike') {
v = '(i?)' + v; // Case-insensitive
subQuery = subQuery ? subQuery.or(row(field)['default'](null).match(v).not()) : row(field)['default'](null).match(v).not();
} else if (op === '|contains') {
subQuery = subQuery ? subQuery.or(row(field)['default']([]).contains(r.expr(v)['default'](null))) : row(field)['default']([]).contains(r.expr(v)['default'](null));
} else if (op === '|notContains') {
subQuery = subQuery ? subQuery.or(row(field)['default']([]).contains(r.expr(v)['default'](null)).not()) : row(field)['default']([]).contains(r.expr(v)['default'](null)).not();
} else if (op === '|in') {
subQuery = subQuery ? subQuery.or(r.expr(v)['default'](r.expr([])).contains(row(field)['default'](null))) : r.expr(v)['default'](r.expr([])).contains(row(field)['default'](null));
} else if (op === '|notIn') {
Expand Down
20 changes: 20 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@ class DSRethinkDBAdapter {
subQuery = subQuery ? subQuery.and(row(field).default([]).setIntersection(r.expr(v).default([])).count().eq(0)) : row(field).default([]).setIntersection(r.expr(v).default([])).count().eq(0)
} else if (op === 'isectNotEmpty') {
subQuery = subQuery ? subQuery.and(row(field).default([]).setIntersection(r.expr(v).default([])).count().ne(0)) : row(field).default([]).setIntersection(r.expr(v).default([])).count().ne(0)
} else if (op === 'like') {
v = '(i?)' + v // Case-insensitive
subQuery = subQuery ? subQuery.and(row(field).default(null).match(v)) : row(field).default(null).match(v)
} else if (op === 'notLike') {
v = '(i?)' + v // Case-insensitive
subQuery = subQuery ? subQuery.and(row(field).default(null).match(v).not()) : row(field).default(null).match(v).not()
} else if (op === 'contains') {
subQuery = subQuery ? subQuery.and(row(field).default([]).contains(r.expr(v).default(null))) : row(field).default([]).contains(r.expr(v).default(null))
} else if (op === 'notContains') {
subQuery = subQuery ? subQuery.and(row(field).default([]).contains(r.expr(v).default(null)).not()) : row(field).default([]).contains(r.expr(v).default(null)).not()
} else if (op === 'in') {
subQuery = subQuery ? subQuery.and(r.expr(v).default(r.expr([])).contains(row(field).default(null))) : r.expr(v).default(r.expr([])).contains(row(field).default(null))
} else if (op === 'notIn') {
Expand All @@ -108,6 +118,16 @@ class DSRethinkDBAdapter {
subQuery = subQuery ? subQuery.or(row(field).default([]).setIntersection(r.expr(v).default([])).count().eq(0)) : row(field).default([]).setIntersection(r.expr(v).default([])).count().eq(0)
} else if (op === '|isectNotEmpty') {
subQuery = subQuery ? subQuery.or(row(field).default([]).setIntersection(r.expr(v).default([])).count().ne(0)) : row(field).default([]).setIntersection(r.expr(v).default([])).count().ne(0)
} else if (op === '|like') {
v = '(i?)' + v // Case-insensitive
subQuery = subQuery ? subQuery.or(row(field).default(null).match(v)) : row(field).default(null).match(v)
} else if (op === '|notLike') {
v = '(i?)' + v // Case-insensitive
subQuery = subQuery ? subQuery.or(row(field).default(null).match(v).not()) : row(field).default(null).match(v).not()
} else if (op === '|contains') {
subQuery = subQuery ? subQuery.or(row(field).default([]).contains(r.expr(v).default(null))) : row(field).default([]).contains(r.expr(v).default(null))
} else if (op === '|notContains') {
subQuery = subQuery ? subQuery.or(row(field).default([]).contains(r.expr(v).default(null)).not()) : row(field).default([]).contains(r.expr(v).default(null)).not()
} else if (op === '|in') {
subQuery = subQuery ? subQuery.or(r.expr(v).default(r.expr([])).contains(row(field).default(null))) : r.expr(v).default(r.expr([])).contains(row(field).default(null))
} else if (op === '|notIn') {
Expand Down
106 changes: 106 additions & 0 deletions test/findAll.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ describe('DSRethinkDBAdapter#findAll', function() {
user = yield adapter.destroy(User, user.id)
assert.isFalse(!!user)
})

it('should filter users using the "in" operator', function*() {
var users = yield adapter.findAll(User, {
where: {
Expand All @@ -54,4 +55,109 @@ describe('DSRethinkDBAdapter#findAll', function() {
user = yield adapter.destroy(User, user.id)
assert.isFalse(!!user)
})

it('should filter users using the "notContains" operator', function*() {
var users = yield adapter.findAll(User, {
where: {
roles: {
'notContains': 'user'
}
}
})
assert.equal(users.length, 0)

var user = yield adapter.create(User, { name: 'John', roles: [ 'admin' ] })

users = yield adapter.findAll(User, {
where: {
roles: {
'notContains': 'user'
}
}
})
assert.equal(users.length, 1)
assert.deepEqual(users[0], { id: user.id, name: 'John', roles: [ 'admin' ] })

user = yield adapter.destroy(User, user.id)
assert.isFalse(!!user)
})

it('should filter users using the "contains" operator', function*() {
var users = yield adapter.findAll(User, {
where: {
roles: {
'contains': 'admin'
}
}
})
assert.equal(users.length, 0)

var user = yield adapter.create(User, { name: 'John', roles: [ 'admin' ] })

users = yield adapter.findAll(User, {
where: {
roles: {
'contains': 'admin'
}
}
})
assert.equal(users.length, 1)
assert.deepEqual(users[0], { id: user.id, name: 'John', roles: [ 'admin' ] })

user = yield adapter.destroy(User, user.id)
assert.isFalse(!!user)
})

it('should filter users using the "like" operator', function*() {
var users = yield adapter.findAll(User, {
where: {
name: {
'like': 'J'
}
}
})

assert.equal(users.length, 0)
var user = yield adapter.create(User, { name: 'John' })

users = yield adapter.findAll(User, {
where: {
name: {
'like': 'J'
}
}
})

assert.equal(users.length, 1)
assert.deepEqual(users[0], { id: user.id, name: 'John' })

user = yield adapter.destroy(User, user.id)
assert.isFalse(!!user)
})

it('should filter users using the "notLike" operator', function*() {
var users = yield adapter.findAll(User, {
where: {
name: {
'notLike': 'x'
}
}
})
assert.equal(users.length, 0);

var user = yield adapter.create(User, { name: 'John' })

users = yield adapter.findAll(User, {
where: {
name: {
'notLike': 'x'
}
}
})
assert.equal(users.length, 1);
assert.deepEqual(users[0], { id: user.id, name: 'John' })

user = yield adapter.destroy(User, user.id)
assert.isFalse(!!user)
})
})