Comparing version 0.0.5 to 0.0.6
@@ -173,3 +173,15 @@ var util = require('util'), | ||
model.mappings = _.merge(_.cloneDeep(this.mappings),model.mappings); | ||
model.fields = _.merge(_.cloneDeep(this.fields),model.fields); | ||
if (model.fields) { | ||
var fields = this.fields; | ||
// allow the extending model to just specify the fields keys and pull out | ||
// the actual values from the extended model field (or merge them) | ||
Object.keys(model.fields).forEach(function(name){ | ||
if (name in fields) { | ||
model.fields[name] = _.merge(_.cloneDeep(fields[name]), model.fields[name]); | ||
} | ||
}); | ||
} | ||
else { | ||
model.fields = _.cloneDeep(this.fields); | ||
} | ||
model.connector = model.connector || this.connector; | ||
@@ -176,0 +188,0 @@ model.methods = _.merge(_.cloneDeep(this.methods),model.methods); |
{ | ||
"name": "api-orm", | ||
"version": "0.0.5", | ||
"version": "0.0.6", | ||
"description": "API Builder ORM", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
94491
2959