Skip to content

Fix database event.data.val() bug #46

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 2 commits into from
May 3, 2017
Merged

Fix database event.data.val() bug #46

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
f7b5b15
Fix bug where event.data.val() was returning array of nulls when data…
May 2, 2017
3ba7d24
small fix
May 3, 2017
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
6 changes: 6 additions & 0 deletions spec/providers/database.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,12 @@ describe('DeltaSnapshot', () => {
populate({ myKey: 'foo', myOtherKey: 'bar' }, { myKey: null });
expect(subject.val()).to.deep.equal({ myOtherKey: 'bar' });
});

// Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995)
it('should return correct values when data has "length" property', () => {
populate(null, { length: 3, foo: 'bar' });
expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar'});
});
});

describe('#child(): DeltaSnapshot', () => {
Expand Down
6 changes: 4 additions & 2 deletions src/providers/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,9 @@ export class DeltaSnapshot implements firebase.database.DataSnapshot {
let numKeys = 0;
let maxKey = 0;
let allIntegerKeys = true;
_.forEach(node, (childNode, key) => {
for (let key in node) {
if (!node.hasOwnProperty(key)) { continue; }
let childNode = node[key];
obj[key] = this._checkAndConvertToArray(childNode);
numKeys++;
const integerRegExp = /^(0|[1-9]\d*)$/;
Expand All @@ -257,7 +259,7 @@ export class DeltaSnapshot implements firebase.database.DataSnapshot {
} else {
allIntegerKeys = false;
}
});
}

if (allIntegerKeys && maxKey < 2 * numKeys) {
// convert to array.
Expand Down