From 7abbee27e59321c15276bf5cb55e82f94dbde33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 8 Sep 2010 19:40:06 +0000 Subject: [PATCH] --- .../com/mysema/query/scala/Conversions.scala | 3 +++ .../scala/com/mysema/query/scala/AliasTest.scala | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala index 27784af29..424277803 100644 --- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala +++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala @@ -6,6 +6,7 @@ package com.mysema.query.scala; import com.mysema.query.alias.Alias._ +import com.mysema.query.types.expr._ import com.mysema.query.types.path._ /** @@ -14,6 +15,8 @@ import com.mysema.query.types.path._ */ object Conversions { + def not(b: EBoolean): EBoolean = b.not() + implicit def _boolean(b: Boolean): PBoolean = $(b); implicit def _string(s: String): PString = $(s); diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala index 8bd348c2b..1a49f4eb8 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala @@ -32,6 +32,21 @@ class AliasTest { assertEquals("domainType.firstName like Hello", (domainType.firstName like "Hello").toString()); assertEquals("domainType.firstName ASC", (domainType.firstName asc).toString()); + // and + var andClause = (domainType.firstName like "An%") and (domainType.firstName like "Be%"); + assertEquals("domainType.firstName like An% && domainType.firstName like Be%", andClause.toString); + + // or + var orClause = (domainType.firstName like "An%") or (domainType.firstName like "Be%"); + assertEquals("domainType.firstName like An% || domainType.firstName like Be%", orClause.toString); + + // not + var notClause = (domainType.firstName like "An%") not; + assertEquals("!domainType.firstName like An%", notClause.toString); + + notClause = not (domainType.firstName like "An%"); + assertEquals("!domainType.firstName like An%", notClause.toString); + // FIXME : "eq" and "ne" are already reserved // assertEquals("domainType.firstName = Hello", (domainType.firstName eq "Hello").toString()); // assertEquals("domainType.firstName != Hello", (domainType.firstName ne "Hello").toString());