Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2534: A boolean is not converted correct when using the hint 'UseLiteralInSQL' - applied Rick's patch to 2.1.x. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1636464 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Heath Thomann 2014-11-03 22:41:29 +00:00
parent 2a1fd9b502
commit 1318c6924e
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
View File

@ -340,12 +340,17 @@ public final class SQLBuffer
} else {
if (type == String.class) {
_sql.append("'" + o.toString().replace("'", "''") + "'");
} else if ( type == Character.class ) {
if (_dict.storeCharsAsNumbers) {
_sql.append(Integer.toString(((Character)o).charValue()));
} else {
_sql.append("'" + o.toString().replace("'", "''") + "'");
}
} else if (type == Boolean.class) {
Boolean b = (Boolean) o;
// We store B(b)ooleans as ints. Convert
_sql.append((b.booleanValue() ? "1" : "0"));
} else {
_sql.append(o.toString());
}

53
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/literals/TestLiteralInSQL.java Normal file
View File

@ -0,0 +1,53 @@
/*
* 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.jpql.literals;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.apache.openjpa.persistence.simple.AllFieldTypes;
import org.apache.openjpa.persistence.test.SQLListenerTestCase;
public class TestLiteralInSQL extends SQLListenerTestCase {
public void setUp() {
setUp(AllFieldTypes.class, "openjpa.jdbc.QuerySQLCache", "false");
}
public void testTrueInSQL() {
EntityManager em = emf.createEntityManager();
em = emf.createEntityManager();
resetSQL();
Query q = em.createQuery("SELECT f FROM AllFieldTypes f WHERE f.booleanField=true");
q.setHint("openjpa.hint.UseLiteralInSQL", "false");
q.getResultList();
// The literal should be converted to a parameter marker since UseLiteralInSQL is false.
assertContainsSQL("booleanField = ?");
resetSQL();
q = em.createQuery("SELECT f FROM AllFieldTypes f WHERE f.booleanField=true");
q.setHint("openjpa.hint.UseLiteralInSQL", "true");
q.getResultList();
// The literal should not be converted to a parameter marker since UseLiteralInSQL is true.
// However, the literal should be converted to a 1 because we store boolean as int/smallint.
assertContainsSQL("booleanField = 1");
}
}