Permalink
Browse files

Merge branch 'master' of https://github.com/max-l/Squeryl into insert…

…able
  • Loading branch information...
lorrin committed Aug 26, 2011
2 parents eb10a20 + 1b4c01d commit 3392a033ce88e891822dcc6f9ba18f8535ee4b3b
Showing with 36 additions and 1 deletion.
  1. +36 −1 src/main/scala/org/squeryl/dsl/boilerplate/JoinSignatures.scala
@@ -94,6 +94,39 @@ trait JoinSignatures {
(a:A,b1:B1,b2:B2,b3:B3,b4:B4,b5:B5,b6:B6,b7:B7) =>
f(a,b1,b2,b3,b4,b5,b6,b7).queryYield
)
+
+ def join[A,B1,B2,B3,B4,B5,B6,B7,B8,C](
+ q: Queryable[A],
+ q1: JoinedQueryable[B1],
+ q2: JoinedQueryable[B2],
+ q3: JoinedQueryable[B3],
+ q4: JoinedQueryable[B4],
+ q5: JoinedQueryable[B5],
+ q6: JoinedQueryable[B6],
+ q7: JoinedQueryable[B7],
+ q8: JoinedQueryable[B8])(
+ f: Function9[A,B1,B2,B3,B4,B5,B6,B7,B8,JoinQueryYield8[C]]): Query[C] =
+ from(q,q1,q2,q3,q4,q5,q6,q7,q8)(
+ (a:A,b1:B1,b2:B2,b3:B3,b4:B4,b5:B5,b6:B6,b7:B7,b8:B8) =>
+ f(a,b1,b2,b3,b4,b5,b6,b7,b8).queryYield
+ )
+
+ def join[A,B1,B2,B3,B4,B5,B6,B7,B8,B9,C](
+ q: Queryable[A],
+ q1: JoinedQueryable[B1],
+ q2: JoinedQueryable[B2],
+ q3: JoinedQueryable[B3],
+ q4: JoinedQueryable[B4],
+ q5: JoinedQueryable[B5],
+ q6: JoinedQueryable[B6],
+ q7: JoinedQueryable[B7],
+ q8: JoinedQueryable[B8],
+ q9: JoinedQueryable[B9])(
+ f: Function10[A,B1,B2,B3,B4,B5,B6,B7,B8,B9,JoinQueryYield9[C]]): Query[C] =
+ from(q,q1,q2,q3,q4,q5,q6,q7,q8,q9)(
+ (a:A,b1:B1,b2:B2,b3:B3,b4:B4,b5:B5,b6:B6,b7:B7,b8:B8,b9:B9) =>
+ f(a,b1,b2,b3,b4,b5,b6,b7,b8,b9).queryYield
+ )
}
@@ -103,4 +136,6 @@ class JoinQueryYield3[R](val queryYield: QueryYield[R])
class JoinQueryYield4[R](val queryYield: QueryYield[R])
class JoinQueryYield5[R](val queryYield: QueryYield[R])
class JoinQueryYield6[R](val queryYield: QueryYield[R])
-class JoinQueryYield7[R](val queryYield: QueryYield[R])
+class JoinQueryYield7[R](val queryYield: QueryYield[R])
+class JoinQueryYield8[R](val queryYield: QueryYield[R])
+class JoinQueryYield9[R](val queryYield: QueryYield[R])

0 comments on commit 3392a03

Please sign in to comment.