verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #126 from strongloop/feature/fix-array-update 

Keep undefined values for the array type
This commit is contained in:
Raymond Feng 2014-05-27 14:41:44 -07:00
parent 5937f0c0d5 050353f11d
commit aa4b5c722a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/model.js
View File

@ -134,8 +134,9 @@ ModelBaseClass.prototype._initProperties = function (data, options) {
} }
} }
var propertyName;
if (applySetters === true) { if (applySetters === true) {
for (var propertyName in data) { for (propertyName in data) {
if (typeof data[propertyName] !== 'function' && ((propertyName in properties) || (propertyName in ctor.relations))) { if (typeof data[propertyName] !== 'function' && ((propertyName in properties) || (propertyName in ctor.relations))) {
self[propertyName] = self.__data[propertyName] || data[propertyName]; self[propertyName] = self.__data[propertyName] || data[propertyName];
} }
@ -144,7 +145,7 @@ ModelBaseClass.prototype._initProperties = function (data, options) {
// Set the unknown properties as properties to the object // Set the unknown properties as properties to the object
if (strict === false) { if (strict === false) {
for (var propertyName in data) { for (propertyName in data) {
if (typeof data[propertyName] !== 'function' && !(propertyName in properties)) { if (typeof data[propertyName] !== 'function' && !(propertyName in properties)) {
self[propertyName] = self.__data[propertyName] || data[propertyName]; self[propertyName] = self.__data[propertyName] || data[propertyName];
} }
@ -174,8 +175,10 @@ ModelBaseClass.prototype._initProperties = function (data, options) {
} }
} }
if (type.name === 'Array' || Array.isArray(type)) { if (type.name === 'Array' || Array.isArray(type)) {
if (!(self.__data[propertyName] instanceof List)) { if (!(self.__data[propertyName] instanceof List)
self.__data[propertyName] = new List(self.__data[propertyName], type, self); && self.__data[propertyName] !== undefined
&& self.__data[propertyName] !== null ) {
self.__data[propertyName] = List(self.__data[propertyName], type, self);
} }
} }
} }

9
test/loopback-dl.test.js
View File

@ -582,7 +582,8 @@ describe('Models attached to a dataSource', function() {
var ds = new DataSource('memory');// define models var ds = new DataSource('memory');// define models
Post = ds.define('Post', { Post = ds.define('Post', {
title: { type: String, length: 255, index: true }, title: { type: String, length: 255, index: true },
content: { type: String } content: { type: String },
comments: [String]
}); });
}); });
@ -613,9 +614,10 @@ describe('Models attached to a dataSource', function() {
}); });
it('updateOrCreate should update the instance without removing existing properties', function (done) { it('updateOrCreate should update the instance without removing existing properties', function (done) {
Post.create({title: 'a', content: 'AAA'}, function (err, post) { Post.create({title: 'a', content: 'AAA', comments: ['Comment1']}, function (err, post) {
post = post.toObject(); post = post.toObject();
delete post.title; delete post.title;
delete post.comments;
Post.updateOrCreate(post, function (err, p) { Post.updateOrCreate(post, function (err, p) {
should.not.exist(err); should.not.exist(err);
p.id.should.be.equal(post.id); p.id.should.be.equal(post.id);
@ -627,7 +629,8 @@ describe('Models attached to a dataSource', function() {
should.not.exist(p._id); should.not.exist(p._id);
p.content.should.be.equal(post.content); p.content.should.be.equal(post.content);
p.title.should.be.equal('a'); p.title.should.be.equal('a');
p.comments.length.should.be.equal(1);
p.comments[0].should.be.equal('Comment1');
done(); done();
}); });
}); });