Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8549 - JPQL TREAT keyword handling is currently case sensitive

This commit is contained in:
Steve Ebersole 2013-09-24 15:13:15 -05:00
parent ae3f1117e0
commit 86b2fa4317
3 changed files with 199 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/antlr/hql.g
View File

@ -369,7 +369,7 @@ joinPath
* Uses a validating semantic predicate to make sure the text of the matched first IDENT is the TREAT keyword
*/
castedJoinPath
: i:IDENT! OPEN! p:path AS! path! CLOSE! {i.getText().equals("treat") }?
: i:IDENT! OPEN! p:path AS! path! CLOSE! {i.getText().equalsIgnoreCase("treat") }?
;
withClause

155
hibernate-core/src/test/java/org/hibernate/test/jpa/ql/IdentificationVariablesTest.java Normal file
View File

@ -0,0 +1,155 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2013, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.jpa.ql;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import org.hibernate.Session;
import org.junit.Test;
import org.hibernate.test.jpa.AbstractJPATest;
/**
* Mainly a test for testing compliance with the fact that "identification variables" (aliases) need to
* be treated as case-insensitive according to JPA.
*
* @author Steve Ebersole
*/
public class IdentificationVariablesTest extends AbstractJPATest {
@Test
public void testUsageInSelect() {
Session s = openSession();
s.createQuery( "select I from Item i" ).list();
s.close();
}
@Test
public void testUsageInPath() {
Session s = openSession();
s.createQuery( "select I from Item i where I.name = 'widget'" ).list();
s.close();
}
@Test
public void testMixedTckUsage() {
Session s = openSession();
s.createQuery( "Select DISTINCT OBJECT(P) from Product p where P.quantity < 10" ).list();
s.close();
}
@Test
public void testUsageInJpaInCollectionSyntax() {
Session s = openSession();
s.createQuery( "SELECT DISTINCT object(i) FROM Item I, IN(i.parts) ip where ip.stockNumber = '123'" ).list();
s.close();
}
@Test
public void testUsageInDistinct() {
Session s = openSession();
s.createQuery( "select distinct(I) from Item i" ).list();
s.close();
}
@Test
public void testUsageInSelectObject() {
Session s = openSession();
s.createQuery( "select OBJECT(I) from Item i" ).list();
s.close();
}
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { Product.class };
}
@Entity( name = "Product")
@Table( name = "PROD" )
@Inheritance( strategy = InheritanceType.SINGLE_TABLE )
@DiscriminatorColumn( name = "PRODUCT_TYPE", discriminatorType = DiscriminatorType.STRING )
@DiscriminatorValue( "Product" )
public static class Product {
private String id;
private String name;
private double price;
private int quantity;
private long partNumber;
@Id
@Column(name = "ID")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "NAME")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "PRICE")
public double getPrice() {
return price;
}
public void setPrice(double price) {
this.price = price;
}
@Column(name = "QUANTITY")
public int getQuantity() {
return quantity;
}
public void setQuantity(int v) {
this.quantity = v;
}
@Column(name = "PNUM")
public long getPartNumber() {
return partNumber;
}
public void setPartNumber(long v) {
this.partNumber = v;
}
}
}

43
hibernate-core/src/test/java/org/hibernate/test/jpa/ql/TreatKeywordTest.java Normal file
View File

@ -0,0 +1,43 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2013, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.test.jpa.ql;
import org.hibernate.Session;
import org.junit.Test;
import org.hibernate.test.jpa.AbstractJPATest;
/**
* @author Steve Ebersole
*/
public class TreatKeywordTest extends AbstractJPATest {
@Test
public void testUsageInSelect() {
Session s = openSession();
s.createQuery( "from MyEntity e join treat(e.other as MySubclassEntity) o" ).list();
s.createQuery( "from MyEntity e join TREAT(e.other as MySubclassEntity) o" ).list();
s.close();
}
}