From 4faccd1eb78c5a628a8f6c2c8e9db7f8bfddae35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Sat, 7 Feb 2015 20:02:15 +0200
Subject: [PATCH 1/2] Fix mapping

---
 querydsl-jpa/pom.xml                                     | 2 +-
 .../main/java/com/querydsl/jpa/EclipseLinkTemplates.java | 2 +-
 .../src/test/java/com/querydsl/jpa/AbstractJPATest.java  | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index cf126959b..c4792ad3a 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -25,7 +25,7 @@
   <properties>
     <hibernate.version>4.3.7.Final</hibernate.version>
     <hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
-    <eclipselink.version>2.5.1</eclipselink.version>
+    <eclipselink.version>2.6.0-RC1</eclipselink.version>
     <osgi.import.package>javax.persistence.*;version="[1.1,3)",${osgi.import.package.root}</osgi.import.package>
   </properties>
   
diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java
index f1a176ac1..a14924eae 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/EclipseLinkTemplates.java
@@ -66,7 +66,7 @@ public class EclipseLinkTemplates extends JPQLTemplates {
 
         add(Ops.CHAR_AT, "substring({0},{1}+1,1)");
         add(JPQLOps.CAST, "cast({0} {1s})");
-        add(Ops.STRING_CAST, "cast({0} varchar(255))");
+        add(Ops.STRING_CAST, "trim(cast({0} char(128)))");
         add(Ops.NUMCAST, "cast({0} {1s})");
 
         // datetime
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
index c5df9b6f0..0277c0727 100644
--- a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
@@ -343,6 +343,15 @@ public abstract class AbstractJPATest {
         }
     }
 
+    @Test
+    public void Cast_ToString() {
+        for (Tuple tuple : query().from(cat).list(cat.breed, cat.breed.stringValue())) {
+            assertEquals(
+                    tuple.get(cat.breed).toString(),
+                    tuple.get(cat.breed.stringValue()));
+        }
+    }
+
     @Test
     public void Collection_Predicates() {
         ListPath<Cat, QCat> path = cat.kittens;

From ca9f8ae175161efab7665d9953b1115622e7dc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Tue, 17 Feb 2015 18:36:48 +0200
Subject: [PATCH 2/2] Add test

---
 .../src/test/java/com/querydsl/jpa/AbstractJPATest.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
index 0277c0727..19f7cfb99 100644
--- a/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractJPATest.java
@@ -352,6 +352,15 @@ public abstract class AbstractJPATest {
         }
     }
 
+    @Test
+    public void Cast_ToString_Append() {
+        for (Tuple tuple : query().from(cat).list(cat.breed, cat.breed.stringValue().append("test"))) {
+            assertEquals(
+                    tuple.get(cat.breed).toString() + "test",
+                    tuple.get(cat.breed.stringValue().append("test")));
+        }
+    }
+
     @Test
     public void Collection_Predicates() {
         ListPath<Cat, QCat> path = cat.kittens;