Skip to content
Closed
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion lib/config-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ConfigLoader.loadDataSources = function(rootDir, env) {
*/
ConfigLoader.loadModels = function(rootDir, env) {
/*jshint unused:false */
return tryReadJsonConfig(rootDir, 'model-config') || {};
return loadNamed(rootDir, env, 'model-config', mergeModelConfig);
};

/**
Expand Down Expand Up @@ -148,6 +148,15 @@ function mergeDataSourceConfig(target, config, fileName) {
}
}

function mergeModelConfig(target, config, fileName) {
for (var mc in target) {
var err = mergeObjects(target[mc], config[mc]);
if (err) {
throw new Error('Cannot apply ' + fileName + ' to `' + mc + '`: ' + err);
}
}
}

function mergeAppConfig(target, config, fileName) {
var err = mergeObjects(target, config);
if (err) {
Expand Down