You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by fa...@apache.org on 2010/09/08 06:54:48 UTC
svn commit: r993601 - in /openjpa/trunk:
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/
openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/
Author: fancy
Date: Wed Sep 8 04:54:47 2010
New Revision: 993601
URL: http://svn.apache.org/viewvc?rev=993601&view=rev
Log:
OPENJPA-1782: Accept double quoted string literal in JPQL
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=993601&r1=993600&r2=993601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java Wed Sep 8 04:54:47 2010
@@ -1025,6 +1025,10 @@ public class JPQLExpressionBuilder
return factory.newLiteral(trimQuotes(node.text),
Literal.TYPE_SQ_STRING);
+ case JJTSTRINGLITERAL2:
+ return factory.newLiteral(trimDoubleQuotes(node.text),
+ Literal.TYPE_SQ_STRING);
+
case JJTPATTERNVALUE:
return eval(firstChild(node));
@@ -1693,6 +1697,19 @@ public class JPQLExpressionBuilder
}
/**
+ * Trim off leading and trailing double-quotes.
+ */
+ private String trimDoubleQuotes(String str) {
+ if (str == null || str.length() <= 1)
+ return str;
+
+ if (str.startsWith("\"") && str.endsWith("\""))
+ str = str.substring(1, str.length() - 1);
+
+ return str;
+ }
+
+ /**
* An IntegerLiteral and DecimalLiteral node will
* have a child node of Negative if it is negative:
* if so, this method returns -1, else it returns 1.
Modified: openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt?rev=993601&r1=993600&r2=993601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt (original)
+++ openjpa/trunk/openjpa-kernel/src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt Wed Sep 8 04:54:47 2010
@@ -282,6 +282,9 @@ TOKEN : /* literals */
)*
"'"
>
+ // Double quoted string
+ | < STRING_LITERAL2: "\"" ( (~["\""]) )* "\""
+ >
| < CHARACTER_LITERAL: "'"
( (~["'","\\","\n","\r"])
| ("\\"
@@ -773,6 +776,7 @@ void literal_or_param() : { }
{
(numeric_literal()
| string_literal()
+ | string_literal2()
| boolean_literal()
| input_parameter()
| entity_type_literal())
@@ -1094,7 +1098,7 @@ void string_expression() : { }
void string_primary() : { }
{
- string_literal() | LOOKAHEAD(path()) path() |
+ string_literal() | string_literal2() | LOOKAHEAD(path()) path() |
LOOKAHEAD(qualified_path()) qualified_path() |
LOOKAHEAD(general_identification_variable()) general_identification_variable() |
LOOKAHEAD(identification_variable()) identification_variable() |
@@ -1416,7 +1420,7 @@ void path_component() #IDENTIFICATIONVAR
void literal() : { }
{
- numeric_literal() | boolean_literal() | string_literal() | enum_literal() | date_literal() |
+ numeric_literal() | boolean_literal() | string_literal() | string_literal2() | enum_literal() | date_literal() |
time_literal() | timestamp_literal()
}
@@ -1455,6 +1459,12 @@ void string_literal() #STRINGLITERAL :
}
+void string_literal2() #STRINGLITERAL2 :
+{ Token t; }
+{
+ t = <STRING_LITERAL2> { jjtThis.setToken (t); }
+}
+
void date_literal() #DATELITERAL :
{ Token t; }
{
@@ -1503,7 +1513,7 @@ void positional_input_parameter() #POSIT
void pattern_value() #PATTERNVALUE : { }
{
- (input_parameter() | string_literal())
+ (input_parameter() | string_literal() | string_literal2())
[(<ESCAPE> escape_character() #ESCAPECHARACTER)]
}
Added: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java?rev=993601&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java (added)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestDoubleQuotedStringLiteralInJPQL.java Wed Sep 8 04:54:47 2010
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.query;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.apache.openjpa.persistence.simple.AllFieldTypes;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
+
+public class TestDoubleQuotedStringLiteralInJPQL
+ extends SingleEMFTestCase {
+
+ public void setUp() {
+ setUp(AllFieldTypes.class, CLEAR_TABLES);
+
+ AllFieldTypes aft = new AllFieldTypes();
+ aft.setStringField("foo'bar");
+ AllFieldTypes aft2 = new AllFieldTypes();
+ aft2.setStringField("foo-bar");
+ AllFieldTypes aft3 = new AllFieldTypes();
+ aft3.setStringField("foo\"bar");
+ EntityManager em = emf.createEntityManager();
+ em.getTransaction().begin();
+ em.persist(aft);
+ em.persist(aft2);
+ em.persist(aft3);
+ em.getTransaction().commit();
+ em.close();
+ }
+
+ public void testdDoubleQuotedStringLiteralInJPQL() {
+ EntityManager em = emf.createEntityManager();
+ Query q = em.createQuery("select count(o) " +
+ "from AllFieldTypes o where o.stringField = \"foo'bar\"");
+ assertEquals(1, ((Number) q.getSingleResult()).longValue());
+ Query q2 = em.createQuery("select count(o) " +
+ "from AllFieldTypes o where o.stringField = \"foo-bar\"");
+ assertEquals(1, ((Number) q2.getSingleResult()).longValue());
+ Query q3 = em.createQuery("select count(o) " +
+ "from AllFieldTypes o where o.stringField = 'foo\"bar'");
+ assertEquals(1, ((Number) q3.getSingleResult()).longValue());
+ Query q4 = em.createQuery("select count(o) " +
+ "from AllFieldTypes o where o.stringField like \"%bar\"");
+ assertEquals(3, ((Number) q4.getSingleResult()).longValue());
+ }
+}