diff --git a/lib/hooks/orm/backwards-compatibility/upgrade-datastore.js b/lib/hooks/orm/backwards-compatibility/upgrade-datastore.js index 8de1fd780..517cc055c 100644 --- a/lib/hooks/orm/backwards-compatibility/upgrade-datastore.js +++ b/lib/hooks/orm/backwards-compatibility/upgrade-datastore.js @@ -83,7 +83,7 @@ module.exports = function howto_normalizeDatastore(sails){ // Defaults connection object to its adapter's defaults // TODO: pull this out into waterline core var itsAdapter = sails.adapters[connectionObject.adapter]; - connection = _.merge({}, itsAdapter.defaults, connectionObject); + connection = sails.util.merge({}, itsAdapter.defaults, connectionObject); // If the adapter has a `registerCollection` method, it must be a v0.9.x adapter if (itsAdapter.registerCollection) {