From f5536948ea40c2ca7532af01ffd1a4a85f3c4b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Mon, 12 Mar 2012 21:15:53 +0200 Subject: [PATCH] #68 improved support for primitive types --- .../scala/com/mysema/query/scala/package.scala | 15 +++++++++------ .../com/mysema/query/scala/ExpressionTest.scala | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala index ecd5af43f..25657ef0e 100644 --- a/querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala +++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/package.scala @@ -33,17 +33,20 @@ package object scala { object Numeric { implicit val byte = new Numeric[Byte] + implicit val byte2 = new Numeric[java.lang.Byte] implicit val double = new Numeric[Double] + implicit val double2 = new Numeric[java.lang.Double] implicit val float = new Numeric[Float] + implicit val float2 = new Numeric[java.lang.Float] implicit val int = new Numeric[Int] + implicit val int2 = new Numeric[java.lang.Integer] implicit val long = new Numeric[Long] - implicit val short = new Numeric[Short] - implicit val byte2 = new Numeric[java.lang.Byte] - implicit val double2 = new Numeric[java.lang.Double] - implicit val float2 = new Numeric[java.lang.Float] - implicit val int2 = new Numeric[java.lang.Integer] implicit val long2 = new Numeric[java.lang.Long] - implicit val short2 = new Numeric[java.lang.Short] + implicit val short = new Numeric[Short] + implicit val short2 = new Numeric[java.lang.Short] + + implicit val bigDecimal = new Numeric[java.math.BigDecimal] + implicit val bigInteger = new Numeric[java.math.BigInteger] } class Numeric[Num] diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala index e355eb098..0d028ab90 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala @@ -150,7 +150,7 @@ class ExpressionTest { @Test def Number_Comparison { assertEquals("person.scalaInt < 5", person.scalaInt lt 5) - assertEquals("person.scalaInt = 5", person.scalaInt eq 5.asInstanceOf[Integer]) // FIXME + assertEquals("person.scalaInt = 5", person.scalaInt eq 5) assertEquals("person.javaInt < 5", person.javaInt lt 5) assertEquals("person.javaInt > 5", person.javaInt gt 5)