Don't use _ global in core hook since it can be turned off

(Or do `var _ = require('lodash');`)
balderdashy · Aug 6, 2014 · 008ce3a · 008ce3a
1 parent 42a0aaf
commit 008ce3a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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) {