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

HHH-4999 - createSQLQuery(query).list() result screw up when when columns in different tables have same name

This commit is contained in:
Steve Ebersole 2011-03-18 08:29:15 -05:00
parent 0a908cb518
commit 53941b9b72
7 changed files with 437 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
hibernate-core/src/main/java/org/hibernate/dialect/ColumnAliasExtractor.java Normal file
View File

@ -0,0 +1,67 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, 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.dialect;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
/**
* Strategy for extracting the unique column alias out of a {@link ResultSetMetaData}. This is used during the
* "auto discovery" phase of native SQL queries.
* <p/>
* Generally this should be done via {@link ResultSetMetaData#getColumnLabel}, but not all drivers do this correctly.
*
* @author Steve Ebersole
*/
public interface ColumnAliasExtractor {
/**
* Extract the unique column alias.
*
* @param metaData The result set metadata
* @param position The column position
*
* @return The alias
*/
public String extractColumnAlias(ResultSetMetaData metaData, int position) throws SQLException;
/**
* An extractor which uses {@link ResultSetMetaData#getColumnLabel}
*/
public static final ColumnAliasExtractor COLUMN_LABEL_EXTRACTOR = new ColumnAliasExtractor() {
@Override
public String extractColumnAlias(ResultSetMetaData metaData, int position) throws SQLException {
return metaData.getColumnLabel( position );
}
};
/**
* An extractor which uses {@link ResultSetMetaData#getColumnName}
*/
public static final ColumnAliasExtractor COLUMN_NAME_EXTRACTOR = new ColumnAliasExtractor() {
@Override
public String extractColumnAlias(ResultSetMetaData metaData, int position) throws SQLException {
return metaData.getColumnName( position );
}
};
}

4
hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
View File

@ -1708,6 +1708,10 @@ public abstract class Dialect {
return " cross join ";
}
public ColumnAliasExtractor getColumnAliasExtractor() {
return ColumnAliasExtractor.COLUMN_LABEL_EXTRACTOR;
}
// Informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
View File

@ -621,7 +621,7 @@ public class CustomLoader extends Loader {
public String getColumnName(int position) throws HibernateException {
try {
return resultSetMetaData.getColumnName( position );
return factory.getDialect().getColumnAliasExtractor().extractColumnAlias( resultSetMetaData, position );
}
catch( SQLException e ) {
throw new HibernateException( "Could not resolve column name [" + position + "]", e );

108
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java Normal file
View File

@ -0,0 +1,108 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, 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.sql.autodiscovery;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.List;
import org.hibernate.Session;
import org.hibernate.jdbc.Work;
import org.junit.Assert;
import org.junit.Test;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
/**
* @author Steve Ebersole
*/
public class AutoDiscoveryTest extends BaseCoreFunctionalTestCase {
private static final String QUERY_STRING =
"select u.name as username, g.name as groupname, m.joindate " +
"from t_membership m " +
" inner join t_user u on m.member_id = u.id " +
" inner join t_group g on m.group_id = g.id";
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { Group.class, User.class, Membership.class };
}
@Test
public void testSqlQueryAutoDiscovery() throws Exception {
Session session = openSession();
session.beginTransaction();
User u = new User( "steve" );
Group g = new Group( "developer" );
Membership m = new Membership( u, g );
session.save( u );
session.save( g );
session.save( m );
session.getTransaction().commit();
session.close();
session = openSession();
session.beginTransaction();
List result = session.createSQLQuery( QUERY_STRING ).list();
Object[] row = (Object[]) result.get( 0 );
Assert.assertEquals( "steve", row[0] );
Assert.assertEquals( "developer", row[1] );
session.delete( m );
session.delete( u );
session.delete( g );
session.getTransaction().commit();
session.close();
}
@Test
public void testDialectGetColumnAliasExtractor() throws Exception {
Session session = openSession();
session.beginTransaction();
session.doWork(
new Work() {
@Override
public void execute(Connection connection) throws SQLException {
PreparedStatement ps = connection.prepareStatement( QUERY_STRING );
ResultSet rs = ps.executeQuery();
try {
ResultSetMetaData metadata = rs.getMetaData();
String column1Alias = getDialect().getColumnAliasExtractor().extractColumnAlias( metadata, 1 );
String column2Alias = getDialect().getColumnAliasExtractor().extractColumnAlias( metadata, 2 );
Assert.assertFalse( "bad dialect.getColumnAliasExtractor impl", column1Alias.equals( column2Alias ) );
}
finally {
rs.close();
ps.close();
}
}
}
);
session.getTransaction().commit();
session.close();
}
}

76
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Group.java Normal file
View File

@ -0,0 +1,76 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, 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.sql.autodiscovery;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import java.util.Set;
/**
* @author Steve Ebersole
*/
@Entity
@Table( name = "t_group")
public class Group {
private Long id;
private String name;
private Set<Membership> memberships;
public Group() {
}
public Group(String name) {
this.name = name;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@OneToMany( mappedBy = "group" )
public Set<Membership> getMemberships() {
return memberships;
}
public void setMemberships(Set<Membership> memberships) {
this.memberships = memberships;
}
}

105
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Membership.java Normal file
View File

@ -0,0 +1,105 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, 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.sql.autodiscovery;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import java.util.Date;
/**
* @author Steve Ebersole
*/
@Entity
@Table( name = "t_membership")
public class Membership {
private Long id;
private User member;
private Group group;
private Date joinDate;
private Float dues;
public Membership() {
}
public Membership(User member, Group group) {
this.member = member;
this.group = group;
this.joinDate = new Date();
}
public Membership(User member, Group group, Date joinDate, Float dues) {
this.member = member;
this.group = group;
this.joinDate = joinDate;
this.dues = dues;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
@ManyToOne
public User getMember() {
return member;
}
public void setMember(User member) {
this.member = member;
}
@ManyToOne
public Group getGroup() {
return group;
}
public void setGroup(Group group) {
this.group = group;
}
public Date getJoinDate() {
return joinDate;
}
public void setJoinDate(Date joinDate) {
this.joinDate = joinDate;
}
public Float getDues() {
return dues;
}
public void setDues(Float dues) {
this.dues = dues;
}
}

76
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/User.java Normal file
View File

@ -0,0 +1,76 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2011, 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.sql.autodiscovery;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import java.util.Set;
/**
* @author Steve Ebersole
*/
@Entity
@Table( name = "t_user")
public class User {
private Long id;
private String name;
private Set<Membership> memberships;
public User() {
}
public User(String name) {
this.name = name;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@OneToMany( mappedBy = "member" )
public Set<Membership> getMemberships() {
return memberships;
}
public void setMemberships(Set<Membership> memberships) {
this.memberships = memberships;
}
}