Skip to content

Fix null pointer includes #2657

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

Merged
merged 3 commits into from
Sep 9, 2016
Merged

Fix null pointer includes #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d1eee2
Adds failing test for #2189
flovilmart Sep 6, 2016
ed784e2
Improves support for null values in includes
flovilmart Sep 6, 2016
e769e2b
nit
flovilmart Sep 6, 2016
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
32 changes: 32 additions & 0 deletions spec/RestQuery.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,36 @@ describe('rest query', () => {
done();
});
});

it('makes sure null pointers are handed correctly #2189', done => {
let object = new Parse.Object('AnObject');
let anotherObject = new Parse.Object('AnotherObject');
anotherObject.save().then(() => {
object.set('values', [null, null, anotherObject]);
return object.save();
}).then(() => {
let query = new Parse.Query('AnObject');
query.include('values');
return query.first();
}).then((result) => {
let values = result.get('values');
expect(values.length).toBe(3);
let anotherObjectFound = false;
let nullCounts = 0;
for(let value of values) {
if (value === null) {
nullCounts++;
} else if (value instanceof Parse.Object) {
anotherObjectFound = true;
}
}
expect(nullCounts).toBe(2);
expect(anotherObjectFound).toBeTruthy();
done();
}, (err) => {
console.error(err);
fail(err);
done();
});
});
});
9 changes: 6 additions & 3 deletions src/RestQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,9 @@ function includePath(config, auth, response, path) {
let pointersHash = {};
var objectIds = {};
for (var pointer of pointers) {
if (!pointer) {
continue;
}
let className = pointer.className;
// only include the good pointers
if (className) {
Expand Down Expand Up @@ -542,7 +545,7 @@ function findPointers(object, path) {
}

if (path.length == 0) {
if (object.__type == 'Pointer') {
if (object === null || object.__type == 'Pointer') {
return [object];
}
return [];
Expand All @@ -564,15 +567,15 @@ function findPointers(object, path) {
function replacePointers(object, path, replace) {
if (object instanceof Array) {
return object.map((obj) => replacePointers(obj, path, replace))
.filter((obj) => obj != null && obj != undefined);
.filter((obj) => typeof obj !== 'undefined');
Copy link
Contributor Author

@flovilmart flovilmart Sep 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strip out undefined, and keep the nulls to match parse.com behaviour

}

if (typeof object !== 'object') {
return object;
}

if (path.length === 0) {
if (object.__type === 'Pointer') {
if (object && object.__type === 'Pointer') {
return replace[object.objectId];
}
return object;
Expand Down