Fix a problem with nosql_builder.join() by @yexing.

petersirka · petersirka · commit 5a3543ce7ca4 · 2017-01-06T08:03:53.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -28,6 +28,7 @@
 - fixed: global alias `I` for isomorphic code
 - fixed: streaming files in `debug` mode (removed cache)
 - fixed: (critical) a bug with authorization in WebSocket
+- fixed: `nosql_builder.join()` a problem with using `nosql_builder.first()` by @yexing (Xing Ye)
 
 - improved: CSS compression
 - improved: code
diff --git a/nosql.js b/nosql.js
@@ -1297,8 +1297,12 @@ DatabaseBuilder.prototype.$callback2 = function(err, response, count) {
 				item[join.field] = join.scalar ? scalar(join.items, join.scalar, join.scalarfield, join.a, join.b != null ? item[join.b] : undefined) : join.first ? findItem(join.items, join.a, item[join.b], join.scalar, join.scalarfield) : findItems(join.items, join.a, item[join.b]);
 			}
 		}
-	} else if (response)
-		response[join.field] = join.scalar ? scalar(join.items, join.scalar, join.scalarfield, join.a, join.b != null ? response[join.b] : undefined) : join.first ? findItem(join.items, join.a, response[join.b]) : findItems(join.items, join.a, response[join.b]);
+	} else if (response) {
+		for (var j = 0; j < jl; j++) {
+			var join = self.$join[keys[j]];
+			response[join.field] = join.scalar ? scalar(join.items, join.scalar, join.scalarfield, join.a, join.b != null ? response[join.b] : undefined) : join.first ? findItem(join.items, join.a, response[join.b], join.scalar, join.scalarfield) : findItems(join.items, join.a, response[join.b]);
+		}
+	}
 
 	self.$callback(err, response, count);
 	return self;

Original file line number	Diff line number	Diff line change
`@@ -1297,8 +1297,12 @@ DatabaseBuilder.prototype.$callback2 = function(err, response, count) {`
`1297`	`1297`	`item[join.field] = join.scalar ? scalar(join.items, join.scalar, join.scalarfield, join.a, join.b != null ? item[join.b] : undefined) : join.first ? findItem(join.items, join.a, item[join.b], join.scalar, join.scalarfield) : findItems(join.items, join.a, item[join.b]);`
`1298`	`1298`	`}`
`1299`	`1299`	`}`
`1300`		`- } else if (response)`
`1301`		`- response[join.field] = join.scalar ? scalar(join.items, join.scalar, join.scalarfield, join.a, join.b != null ? response[join.b] : undefined) : join.first ? findItem(join.items, join.a, response[join.b]) : findItems(join.items, join.a, response[join.b]);`
	`1300`	`+ } else if (response) {`
	`1301`	`+ for (var j = 0; j < jl; j++) {`
	`1302`	`+ var join = self.$join[keys[j]];`
	`1303`	`+ response[join.field] = join.scalar ? scalar(join.items, join.scalar, join.scalarfield, join.a, join.b != null ? response[join.b] : undefined) : join.first ? findItem(join.items, join.a, response[join.b], join.scalar, join.scalarfield) : findItems(join.items, join.a, response[join.b]);`
	`1304`	`+ }`
	`1305`	`+ }`
`1302`	`1306`
`1303`	`1307`	`self.$callback(err, response, count);`
`1304`	`1308`	`return self;`