This commit is contained in:
Timo Westkämper 2009-03-30 12:48:55 +00:00
parent f15a171995
commit 6045b2015d
2 changed files with 4 additions and 2 deletions

View File

@ -137,7 +137,6 @@ public class AbstractColQuery<SubType extends AbstractColQuery<SubType>> impleme
return new DefaultIndexSupport(new SimpleIteratorSource(exprToIt), ops, sources);
}
// TODO : this signature isn't right when used with custom iterator source
public <A> SubType from(Expr<A> entity, A first, A... rest) {
List<A> list = new ArrayList<A>(rest.length + 1);
list.add(first);
@ -145,7 +144,6 @@ public class AbstractColQuery<SubType extends AbstractColQuery<SubType>> impleme
return from(entity, list);
}
// TODO : this signature isn't right when used with custom iterator source
public <A> SubType from(Expr<A> entity, Iterable<? extends A> col) {
alias(entity, col);
query.from((Expr<?>)entity);

View File

@ -181,6 +181,10 @@ public class ColQueryTest extends AbstractQueryTest{
assertEquals("null path in expression", e.getMessage());
}
// 12
TestQuery query = query().from(cat, c1, c2).from(cat, c1, c2);
assertEquals(1, query.getMetadata().getJoins().size());
}
@Test