remove schema from transformWhere
This commit is contained in:
@@ -106,7 +106,7 @@ describe('parseObjectToMongoObjectForCreate', () => {
|
||||
|
||||
describe('transformWhere', () => {
|
||||
it('objectId', (done) => {
|
||||
var out = transform.transformWhere(dummySchema, null, {objectId: 'foo'});
|
||||
var out = transform.transformWhere(null, {objectId: 'foo'});
|
||||
expect(out._id).toEqual('foo');
|
||||
done();
|
||||
});
|
||||
@@ -115,7 +115,7 @@ describe('transformWhere', () => {
|
||||
var input = {
|
||||
objectId: {'$in': ['one', 'two', 'three']},
|
||||
};
|
||||
var output = transform.transformWhere(dummySchema, null, input);
|
||||
var output = transform.transformWhere(null, input);
|
||||
jequal(input.objectId, output._id);
|
||||
done();
|
||||
});
|
||||
|
||||
@@ -177,13 +177,7 @@ export class MongoStorageAdapter {
|
||||
deleteObjectsByQuery(className, query, schemaController, validate, parseFormatSchema) {
|
||||
return this.adaptiveCollection(className)
|
||||
.then(collection => {
|
||||
let mongoWhere = transform.transformWhere(
|
||||
schemaController,
|
||||
className,
|
||||
query,
|
||||
{ validate },
|
||||
parseFormatSchema
|
||||
);
|
||||
let mongoWhere = transform.transformWhere(className, query, { validate }, parseFormatSchema);
|
||||
return collection.deleteMany(mongoWhere)
|
||||
})
|
||||
.then(({ result }) => {
|
||||
|
||||
@@ -139,7 +139,7 @@ const valueAsDate = value => {
|
||||
return false;
|
||||
}
|
||||
|
||||
function transformQueryKeyValue(schema, className, key, value, { validate } = {}, parseFormatSchema) {
|
||||
function transformQueryKeyValue(className, key, value, { validate } = {}, parseFormatSchema) {
|
||||
switch(key) {
|
||||
case 'createdAt':
|
||||
if (valueAsDate(value)) {
|
||||
@@ -168,12 +168,12 @@ function transformQueryKeyValue(schema, className, key, value, { validate } = {}
|
||||
if (!(value instanceof Array)) {
|
||||
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'bad $or format - use an array value');
|
||||
}
|
||||
return {key: '$or', value: value.map(subQuery => transformWhere(schema, className, subQuery, {}, parseFormatSchema))};
|
||||
return {key: '$or', value: value.map(subQuery => transformWhere(className, subQuery, {}, parseFormatSchema))};
|
||||
case '$and':
|
||||
if (!(value instanceof Array)) {
|
||||
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'bad $and format - use an array value');
|
||||
}
|
||||
return {key: '$and', value: value.map(subQuery => transformWhere(schema, className, subQuery, {}, parseFormatSchema))};
|
||||
return {key: '$and', value: value.map(subQuery => transformWhere(className, subQuery, {}, parseFormatSchema))};
|
||||
default:
|
||||
// Other auth data
|
||||
const authDataMatch = key.match(/^authData\.([a-zA-Z0-9_]+)\.id$/);
|
||||
@@ -222,13 +222,13 @@ function transformQueryKeyValue(schema, className, key, value, { validate } = {}
|
||||
// restWhere is the "where" clause in REST API form.
|
||||
// Returns the mongo form of the query.
|
||||
// Throws a Parse.Error if the input query is invalid.
|
||||
function transformWhere(schema, className, restWhere, { validate = true } = {}, parseFormatSchema) {
|
||||
function transformWhere(className, restWhere, { validate = true } = {}, parseFormatSchema) {
|
||||
let mongoWhere = {};
|
||||
if (restWhere['ACL']) {
|
||||
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Cannot query on ACL.');
|
||||
}
|
||||
for (let restKey in restWhere) {
|
||||
let out = transformQueryKeyValue(schema, className, restKey, restWhere[restKey], { validate }, parseFormatSchema);
|
||||
let out = transformQueryKeyValue(className, restKey, restWhere[restKey], { validate }, parseFormatSchema);
|
||||
mongoWhere[out.key] = out.value;
|
||||
}
|
||||
return mongoWhere;
|
||||
|
||||
@@ -184,13 +184,7 @@ DatabaseController.prototype.update = function(className, query, update, {
|
||||
throw error;
|
||||
})
|
||||
.then(parseFormatSchema => {
|
||||
var mongoWhere = this.transform.transformWhere(
|
||||
schemaController,
|
||||
className,
|
||||
query,
|
||||
{validate: !this.skipValidation},
|
||||
parseFormatSchema
|
||||
);
|
||||
var mongoWhere = this.transform.transformWhere(className, query, {validate: !this.skipValidation}, parseFormatSchema);
|
||||
mongoUpdate = this.transform.transformUpdate(
|
||||
schemaController,
|
||||
className,
|
||||
@@ -664,7 +658,7 @@ DatabaseController.prototype.find = function(className, query, {
|
||||
throw error;
|
||||
})
|
||||
.then(parseFormatSchema => {
|
||||
let mongoWhere = this.transform.transformWhere(schemaController, className, query, {}, parseFormatSchema);
|
||||
let mongoWhere = this.transform.transformWhere(className, query, {}, parseFormatSchema);
|
||||
if (count) {
|
||||
delete mongoOptions.limit;
|
||||
return collection.count(mongoWhere, mongoOptions);
|
||||
|
||||
Reference in New Issue
Block a user