DRY up code & convert spaces to tabs

dxg · dxg · commit d1d6ba5771c4 · 2015-12-02T08:50:38.000+11:00
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
@@ -132,6 +132,17 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 		});
 	}
 
+	function adjustForMapsTo(options) {
+		// Loop through the (cloned) association model id fields ... some of them may've been mapped to different
+		// names in the actual database - if so update to the mapped database column name
+		for(i=0; i<options.__merge.to.field.length; i++) {
+			var idProp = association.model.properties[options.__merge.to.field[i]];
+			if(idProp && idProp.mapsTo) {
+				options.__merge.to.field[i] = idProp.mapsTo;
+			}
+		}
+	}
+
 	Object.defineProperty(Instance, association.hasAccessor, {
 		value: function () {
 			var Instances = Array.prototype.slice.apply(arguments);
@@ -153,14 +164,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				where:  [ association.mergeTable, {} ]
 			};
 
-        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
-        // names in the actual database - if so update to the mapped database column name
-        for(i=0; i<options.__merge.to.field.length; i++) {
-          var idProp = association.model.properties[options.__merge.to.field[i]];
-          if(idProp && idProp.mapsTo) {
-            options.__merge.to.field[i] = idProp.mapsTo;
-          }
-        }
+			adjustForMapsTo(options);
 
 			options.extra = association.props;
 			options.extra_info = {
@@ -245,14 +249,7 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 				where : [ association.mergeTable, {} ]
 			};
 
-        // Loop through the (cloned) association model id fields ... some of them may've been mapped to different
-        // names in the actual database - if so update to the mapped database column name
-        for(i=0; i<options.__merge.to.field.length; i++) {
-          var idProp = association.model.properties[options.__merge.to.field[i]];
-          if(idProp && idProp.mapsTo) {
-            options.__merge.to.field[i] = idProp.mapsTo;
-          }
-        }
+			adjustForMapsTo(options);
 
 		  options.extra = association.props;
 		  options.extra_info = {
