Changes autoFetch to avoid autofetching if instance is not saved (it's new!) (#242)

dresende · dresende · commit 19ee31e290ad · 2013-07-29T19:44:34.000+01:00
diff --git a/lib/Associations/Extend.js b/lib/Associations/Extend.js
@@ -159,6 +159,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
+	if (!Instance.saved()) {
+		return cb();
+	}
+
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
diff --git a/lib/Associations/Many.js b/lib/Associations/Many.js
@@ -388,6 +388,10 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
+	if (!Instance.saved()) {
+		return cb();
+	}
+
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}
diff --git a/lib/Associations/One.js b/lib/Associations/One.js
@@ -223,6 +223,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {
 }
 
 function autoFetchInstance(Instance, association, opts, cb) {
+	if (!Instance.saved()) {
+		return cb();
+	}
+
 	if (!opts.hasOwnProperty("autoFetchLimit") || typeof opts.autoFetchLimit == "undefined") {
 		opts.autoFetchLimit = association.autoFetchLimit;
 	}

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`function autoFetchInstance(Instance, association, opts, cb) {`
	`162`	`+ if (!Instance.saved()) {`
	`163`	`+ return cb();`
	`164`	`+ }`
	`165`	`+`
`162`	`166`	`if (!opts.hasOwnProperty("autoFetchLimit") \|\| typeof opts.autoFetchLimit == "undefined") {`
`163`	`167`	`opts.autoFetchLimit = association.autoFetchLimit;`
`164`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,10 @@ function extendInstance(Model, Instance, Driver, association, opts, createInstan`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`function autoFetchInstance(Instance, association, opts, cb) {`
	`391`	`+ if (!Instance.saved()) {`
	`392`	`+ return cb();`
	`393`	`+ }`
	`394`	`+`
`391`	`395`	`if (!opts.hasOwnProperty("autoFetchLimit") \|\| typeof opts.autoFetchLimit == "undefined") {`
`392`	`396`	`opts.autoFetchLimit = association.autoFetchLimit;`
`393`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,10 @@ function extendInstance(Model, Instance, Driver, association, opts) {`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`function autoFetchInstance(Instance, association, opts, cb) {`
	`226`	`+ if (!Instance.saved()) {`
	`227`	`+ return cb();`
	`228`	`+ }`
	`229`	`+`
`226`	`230`	`if (!opts.hasOwnProperty("autoFetchLimit") \|\| typeof opts.autoFetchLimit == "undefined") {`
`227`	`231`	`opts.autoFetchLimit = association.autoFetchLimit;`
`228`	`232`	`}`