forked from balderdashy/waterline
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This closes issue #1489
- Loading branch information
Showing
9 changed files
with
274 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| var assert = require('assert'); | ||
| var _ = require('@sailshq/lodash'); | ||
| var Waterline = require('../../../lib/waterline'); | ||
|
|
||
| describe('Collection Query ::', function() { | ||
| describe('.find()', function() { | ||
| describe('with meta unsafe flag', function(){ | ||
| var query; | ||
|
|
||
| before(function(done) { | ||
| var waterline = new Waterline(); | ||
| var Model = Waterline.Model.extend({ | ||
| identity: 'user', | ||
| connection: 'foo', | ||
| primaryKey: 'id', | ||
| schema: false, | ||
| attributes: { | ||
| id: { | ||
| type: 'number' | ||
| }, | ||
| name: { | ||
| type: 'string', | ||
| defaultsTo: 'Foo Bar' | ||
| }, | ||
| nested: { | ||
| type: 'json' | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| waterline.registerModel(Model); | ||
|
|
||
| // Fixture Adapter Def | ||
| var adapterDef = { find: function(con, query, cb) { return cb(null, [{id: 1, criteria: query.criteria}]); }}; | ||
|
|
||
| var connections = { | ||
| 'foo': { | ||
| adapter: 'foobar' | ||
| } | ||
| }; | ||
|
|
||
| waterline.initialize({ adapters: { foobar: adapterDef }, datastores: connections }, function(err, orm) { | ||
| if(err) { | ||
| return done(err); | ||
| } | ||
| query = orm.collections.user; | ||
| return done(); | ||
| }); | ||
| }); | ||
|
|
||
| it('should allow meta to be optional', function(done) { | ||
| query.find({}, function(err) { | ||
| if(err) { | ||
| return done(err); | ||
| } | ||
|
|
||
| return done(); | ||
| }); | ||
| }); | ||
|
|
||
| it('should block a query not explicitly unsafe', function(done) { | ||
| query.find({ | ||
| 'nested.key': 'foobar' | ||
| }, function(err) { | ||
| if(err) { | ||
| return done(); | ||
| } | ||
|
|
||
| return done(new Error('Unsafe query allowed through by default!')); | ||
| }); | ||
| }); | ||
|
|
||
| it('should allow a mongo-style query to pass through to the adapter with meta.unsafe', function(done) { | ||
| query.find() | ||
| .where({ 'nested.key': 'Foo Bar' }) | ||
| .sort([{ 'nested.key': 'desc' }]) | ||
| .meta({unsafe: true}) | ||
| .exec(function(err, results) { | ||
| if (err) { | ||
| return done(err); | ||
| } | ||
|
|
||
| assert(_.isArray(results)); | ||
| assert.equal(results[0].criteria.where['nested.key'], 'Foo Bar'); | ||
| assert.equal(results[0].criteria.sort[0]['nested.key'], 'DESC'); | ||
|
|
||
| return done(); | ||
| }); | ||
| }); | ||
|
|
||
| it('should still normalize mongo-style waterline queries with meta.unsafe', function(done) { | ||
| query.find() | ||
| .where({ 'nested.key': ['Foo Bar'] }) | ||
| .sort([{ 'nested.key': 'desc' }]) | ||
| .meta({unsafe: true}) | ||
| .exec(function(err, results) { | ||
| if (err) { | ||
| return done(err); | ||
| } | ||
|
|
||
| assert(_.isArray(results)); | ||
| assert.equal(results[0].criteria.where['nested.key'].in[0], 'Foo Bar'); | ||
| assert.equal(results[0].criteria.sort[0]['nested.key'], 'DESC'); | ||
|
|
||
| return done(); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.