allow multiple joins - closes brianc#15

brianc · brianc · commit d2d4e1be5ae5 · 2012-12-21T18:54:04.000Z
diff --git a/lib/node/join.js b/lib/node/join.js
@@ -1,12 +1,15 @@
-module.exports = require(__dirname).define({
+var JoinNode = module.exports = require(__dirname).define({
   type: 'JOIN',
   constructor: function(subType, from, to) {
     this.subType = subType;
-    this.from = from;
-    this.to = to;
+    this.from = from.toNode();
+    this.to = to.toNode();
   },
   on: function(node) {
     this.on = node;
     return this;
+  },
+  join: function(other) {
+    return new JoinNode('INNER', this, other);
   }
 });
diff --git a/lib/table.js b/lib/table.js
@@ -77,7 +77,7 @@ Table.prototype.toNode = function() {
 }
 
 Table.prototype.join = function(other) {
-  return new JoinNode('INNER', this.toNode(), other.toNode());
+  return new JoinNode('INNER', this.toNode(), other.toNode(), other);
 }
 
 Table.prototype.as = function(alias) {
diff --git a/test/dialect-tests.js b/test/dialect-tests.js
@@ -92,6 +92,23 @@ test({
   pg    : 'SELECT "user"."name", "post"."content" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")'
 });
 
+var comment = Table.define({
+  name: 'comment',
+  columns: ['postId', 'text']
+});
+
+test({
+  query : user
+            .select(user.name, post.content, comment.text)
+            .from(
+              user
+                .join(post).on(user.id.equals(post.userId))
+                .join(comment).on(post.id.equals(comment.postId))
+            ),
+  pg    : 'SELECT "user"."name", "post"."content", "comment"."text" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")' +
+          ' INNER JOIN "comment" ON ("post"."id" = "comment"."postId")'
+});
+
 test({
   query : user.select(user.name, post.content).from(user.join(post).on(user.id.equals(post.userId))),
   pg    : 'SELECT "user"."name", "post"."content" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")'

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ Table.prototype.toNode = function() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`Table.prototype.join = function(other) {`
`80`		`- return new JoinNode('INNER', this.toNode(), other.toNode());`
	`80`	`+ return new JoinNode('INNER', this.toNode(), other.toNode(), other);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`Table.prototype.as = function(alias) {`