Skip to content

Commit b0e40b9

Browse files
wangxiaoleeyeh
authored andcommitted
fix AV.File can not be queried issue. (#341)
1 parent 17caf89 commit b0e40b9

File tree

4 files changed

+35
-8
lines changed

4 files changed

+35
-8
lines changed

src/file.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,11 @@ module.exports = function(AV) {
342342
AV.File = function(name, data, type) {
343343

344344
this.attributes = {
345-
name: name,
345+
name,
346346
url: '',
347347
metaData: {},
348348
// 用来存储转换后要上传的 base64 String
349-
base64: ''
349+
base64: '',
350350
};
351351

352352
let owner;
@@ -441,6 +441,8 @@ module.exports = function(AV) {
441441
};
442442

443443
AV.File.prototype = {
444+
className: '_File',
445+
444446
toJSON: function() {
445447
return AV._encode(this);
446448
},

src/query.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,10 @@ module.exports = function(AV) {
161161
var query = new AV.Query(response.className);
162162
var results = _.map(response.results, function(json) {
163163
var obj = query._newObject(response);
164-
obj._finishFetch(query._processResult(json), true);
165-
return obj;
164+
if (obj._finishFetch) {
165+
obj._finishFetch(query._processResult(json), true);
166+
}
167+
return obj;
166168
});
167169
return {
168170
results: results,
@@ -273,7 +275,9 @@ module.exports = function(AV) {
273275
return request.then(function(response) {
274276
return _.map(response.results, function(json) {
275277
var obj = self._newObject(response);
276-
obj._finishFetch(self._processResult(json), true);
278+
if (obj._finishFetch) {
279+
obj._finishFetch(self._processResult(json), true);
280+
}
277281
return obj;
278282
});
279283
})._thenRunCallbacks(options);
@@ -333,7 +337,9 @@ module.exports = function(AV) {
333337
return request.then(function(response) {
334338
return _.map(response.results, function(json) {
335339
var obj = self._newObject();
336-
obj._finishFetch(self._processResult(json), true);
340+
if (obj._finishFetch) {
341+
obj._finishFetch(self._processResult(json), true);
342+
}
337343
return obj;
338344
})[0];
339345
})._thenRunCallbacks(options);

test/query.js

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
// queries
43
var GameScore = AV.Object.extend('GameScore');
54
var Person = AV.Object.extend('Person');
65
var TestClass = AV.Object.extend('TestClass');
@@ -388,4 +387,24 @@ describe('Queries', function () {
388387
});
389388
});
390389

390+
describe('All Files', function () {
391+
it('should return AV.File Object list', function () {
392+
query = new AV.Query(AV.File);
393+
return query.find().then(function(results) {
394+
expect(results.length > 0).to.be.ok();
395+
expect(results[0].get('metaData')).to.be.ok();
396+
});
397+
});
398+
});
399+
400+
describe('All User', function () {
401+
it('should return AV.User Object list', function () {
402+
query = new AV.Query(AV.User);
403+
return query.find().then(function(results) {
404+
expect(results.length > 0).to.be.ok();
405+
expect(results[0].get('username')).to.be.ok();
406+
});
407+
});
408+
});
409+
391410
});

test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (typeof require !== 'undefined') {
1616
AV.init({
1717
appId: '95TNUaOSUd8IpKNW0RSqSEOm-9Nh9j0Va',
1818
appKey: 'gNAE1iHowdQvV7cqpfCMGaGN',
19-
masterKey: 'ue9M9nqwD4MQNXD3oiN5rAOv'
19+
masterKey: 'ue9M9nqwD4MQNXD3oiN5rAOv',
2020
});
2121
AV.setProduction(true);
2222
AV._useMasterKey = true;

0 commit comments

Comments
 (0)