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

HHH-11614 : Revert "HHH-11477 - HQL query against field marked with @Lob fails on PostgreSQL" 

This reverts commit f0016db201.
This commit is contained in:
Gail Badner 2017-09-07 22:01:17 -07:00
parent 31942cb3e4
commit 9f2edb654d
8 changed files with 21 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
View File

@ -188,7 +188,7 @@ public class PostgreSQL81Dialect extends Dialect {
break; break;
} }
case Types.CLOB: { case Types.CLOB: {
descriptor = ClobTypeDescriptor.POSTGRESQL_CLOB_BINDING; descriptor = ClobTypeDescriptor.CLOB_BINDING;
break; break;
} }
default: { default: {

6
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java
View File

@ -107,9 +107,6 @@ public class ClobTypeDescriptor extends AbstractTypeDescriptor<Clob> {
: value; : value;
return (X) clob; return (X) clob;
} }
else if ( String.class.isAssignableFrom( type ) ) {
return (X) DataHelper.extractString( value.getCharacterStream());
}
} }
catch ( SQLException e ) { catch ( SQLException e ) {
throw new HibernateException( "Unable to access clob stream", e ); throw new HibernateException( "Unable to access clob stream", e );
@ -132,9 +129,6 @@ public class ClobTypeDescriptor extends AbstractTypeDescriptor<Clob> {
Reader reader = (Reader) value; Reader reader = (Reader) value;
return options.getLobCreator().createClob( DataHelper.extractString( reader ) ); return options.getLobCreator().createClob( DataHelper.extractString( reader ) );
} }
else if ( String.class.isAssignableFrom( value.getClass() ) ) {
return options.getLobCreator().createClob( (String) value );
}
throw unknownWrap( value.getClass() ); throw unknownWrap( value.getClass() );
} }

42
hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/ClobTypeDescriptor.java
View File

@ -114,48 +114,6 @@ public abstract class ClobTypeDescriptor implements SqlTypeDescriptor {
} }
}; };
public static final ClobTypeDescriptor POSTGRESQL_CLOB_BINDING = new ClobTypeDescriptor() {
@Override
public <X> ValueExtractor<X> getExtractor(JavaTypeDescriptor<X> javaTypeDescriptor) {
return new BasicExtractor<X>( javaTypeDescriptor, this ) {
@Override
protected X doExtract(ResultSet rs, String name, WrapperOptions options) throws SQLException {
return javaTypeDescriptor.wrap( rs.getString( name ), options );
}
@Override
protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
throws SQLException {
return javaTypeDescriptor.wrap( statement.getString( index ), options );
}
@Override
protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
throws SQLException {
return javaTypeDescriptor.wrap( statement.getString( name ), options );
}
};
}
@Override
public <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {
return new BasicBinder<X>( javaTypeDescriptor, this ) {
@Override
protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
throws SQLException {
st.setString( index, javaTypeDescriptor.unwrap( value, String.class, options ) );
}
@Override
protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
throws SQLException {
st.setString( name, javaTypeDescriptor.unwrap( value, String.class, options ) );
}
};
}
};
public static final ClobTypeDescriptor STREAM_BINDING = new ClobTypeDescriptor() { public static final ClobTypeDescriptor STREAM_BINDING = new ClobTypeDescriptor() {
@Override @Override
public <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) { public <X> BasicBinder<X> getClobBinder(final JavaTypeDescriptor<X> javaTypeDescriptor) {

227
hibernate-core/src/test/java/org/hibernate/test/lob/LobStringTest.java
View File

@ -1,227 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.lob;
import java.sql.Clob;
import java.sql.SQLException;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.Table;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.engine.jdbc.ClobProxy;
import org.hibernate.query.Query;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.testing.transaction.TransactionUtil;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
/**
* @author Andrea Boriero
*/
@TestForIssue(jiraKey = "HHH-11477")
@SkipForDialect(Oracle8iDialect.class)
public class LobStringTest extends BaseCoreFunctionalTestCase {
//SQL Server - VARCHAR(MAX) is limited to 8000 bytes only
private static final int LONG_STRING_SIZE = 3999;
private final String value1 = buildRecursively( LONG_STRING_SIZE, 'x' );
private final String value2 = buildRecursively( LONG_STRING_SIZE, 'y' );
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] {TestEntity.class};
}
@Override
protected void prepareTest() throws Exception {
TestEntity entity = new TestEntity();
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
entity.setFirstLobField( value1 );
entity.setSecondLobField( value2 );
entity.setClobField( session.getLobHelper().createClob( value2 ) );
session.save( entity );
} );
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final TestEntity testEntity = session.find( TestEntity.class, entity.getId() );
assertThat( testEntity.getFirstLobField(), is( value1 ) );
} );
}
@Test
@TestForIssue(jiraKey = "HHH-11477")
public void testHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery( "from TestEntity" );
final List<TestEntity> results = query.list();
assertThat( results.size(), is( 1 ) );
final TestEntity testEntity = results.get( 0 );
assertThat( testEntity.getFirstLobField(), is( value1 ) );
assertThat( testEntity.getSecondLobField(), is( value2 ) );
final Clob clobField = testEntity.getClobField();
try {
assertThat( clobField.getSubString( 1, (int) clobField.length() ), is( value2 ) );
}
catch (SQLException e) {
fail( e.getMessage() );
}
} );
}
@Test
@TestForIssue(jiraKey = "HHH-11477")
public void testUsingStringLobAnnotatedPropertyInHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery( "from TestEntity where LOWER(firstLobField) LIKE :value" );
query.setParameter( "value", value1 );
final List<TestEntity> results = query.list();
assertThat( results.size(), is( 1 ) );
final TestEntity testEntity = results.get( 0 );
assertThat( testEntity.getFirstLobField(), is( value1 ) );
assertThat( testEntity.getSecondLobField(), is( value2 ) );
final Clob clobField = testEntity.getClobField();
try {
assertThat( clobField.getSubString( 1, (int) clobField.length() ), is( value2 ) );
}
catch (SQLException e) {
fail( e.getMessage() );
}
} );
}
@Test
@TestForIssue(jiraKey = "HHH-11477")
public void testSelectStringLobAnnotatedInHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery(
"select t.secondLobField from TestEntity t where LOWER(t.firstLobField) LIKE :value" );
query.setParameter( "value", value1 );
final List<String> results = query.list();
assertThat( results.size(), is( 1 ) );
assertThat( results.get( 0 ), is( value2 ) );
} );
}
@Test
@TestForIssue(jiraKey = "HHH-11477")
public void testUsingLobPropertyInHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery(
"select t.secondLobField from TestEntity t where LOWER(t.clobField) LIKE :value" );
query.setParameter( "value", ClobProxy.generateProxy( value2 ) );
final List<String> results = query.list();
assertThat( results.size(), is( 1 ) );
assertThat( results.get( 0 ), is( value2 ) );
} );
}
@Test
@TestForIssue(jiraKey = "HHH-11477")
public void testSelectClobPropertyInHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery(
"select t.clobField from TestEntity t where LOWER(t.clobField) LIKE :value" );
query.setParameter( "value", ClobProxy.generateProxy( value2 ) );
final List<Clob> results = query.list();
assertThat( results.size(), is( 1 ) );
final Clob clobField = results.get( 0 );
try {
assertThat( clobField.getSubString( 1, (int) clobField.length() ), is( value2 ) );
}
catch (SQLException e) {
fail( e.getMessage() );
}
} );
}
@Entity(name = "TestEntity")
@Table(name = "TEST_ENTITY")
public static class TestEntity {
@Id
@GeneratedValue
private long id;
@Lob
@Column(length = LONG_STRING_SIZE) //needed by HSQLDialect
String firstLobField;
@Lob
@Column(length = LONG_STRING_SIZE) //needed by HSQLDialect
String secondLobField;
@Lob
@Column(length = LONG_STRING_SIZE) //needed by HSQLDialect
Clob clobField;
public long getId() {
return id;
}
public String getFirstLobField() {
return firstLobField;
}
public void setFirstLobField(String firstLobField) {
this.firstLobField = firstLobField;
}
public String getSecondLobField() {
return secondLobField;
}
public void setSecondLobField(String secondLobField) {
this.secondLobField = secondLobField;
}
public Clob getClobField() {
return clobField;
}
public void setClobField(Clob clobField) {
this.clobField = clobField;
}
}
@Override
protected boolean isCleanupTestDataRequired() {
return true;
}
private String buildRecursively(int size, char baseChar) {
StringBuilder buff = new StringBuilder();
for ( int i = 0; i < size; i++ ) {
buff.append( baseChar );
}
return buff.toString();
}
}

84
hibernate-core/src/test/java/org/hibernate/test/lob/LongStringTest.java
View File

@ -5,24 +5,15 @@
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/ */
package org.hibernate.test.lob; package org.hibernate.test.lob;
import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.query.Query;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.testing.transaction.TransactionUtil;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
/** /**
* Tests eager materialization and mutation of long strings. * Tests eager materialization and mutation of long strings.
@ -32,13 +23,13 @@ import static org.junit.Assert.assertThat;
@SuppressWarnings( {"UnusedDeclaration"}) @SuppressWarnings( {"UnusedDeclaration"})
public abstract class LongStringTest extends BaseCoreFunctionalTestCase { public abstract class LongStringTest extends BaseCoreFunctionalTestCase {
private static final int LONG_STRING_SIZE = 10000; private static final int LONG_STRING_SIZE = 10000;
private static final String EMPTY = "";
private final String original = buildRecursively( LONG_STRING_SIZE, 'x' );
private final String changed = buildRecursively( LONG_STRING_SIZE, 'y' );
@Test @Test
public void testBoundedLongStringAccess() { public void testBoundedLongStringAccess() {
String original = buildRecursively( LONG_STRING_SIZE, 'x' );
String changed = buildRecursively( LONG_STRING_SIZE, 'y' );
String empty = "";
Session s = openSession(); Session s = openSession();
s.beginTransaction(); s.beginTransaction();
LongStringHolder entity = new LongStringHolder(); LongStringHolder entity = new LongStringHolder();
@ -48,7 +39,7 @@ public abstract class LongStringTest extends BaseCoreFunctionalTestCase {
s = openSession(); s = openSession();
s.beginTransaction(); s.beginTransaction();
entity = s.get( LongStringHolder.class, entity.getId() ); entity = ( LongStringHolder ) s.get( LongStringHolder.class, entity.getId() );
assertNull( entity.getLongString() ); assertNull( entity.getLongString() );
entity.setLongString( original ); entity.setLongString( original );
s.getTransaction().commit(); s.getTransaction().commit();
@ -56,7 +47,7 @@ public abstract class LongStringTest extends BaseCoreFunctionalTestCase {
s = openSession(); s = openSession();
s.beginTransaction(); s.beginTransaction();
entity = s.get( LongStringHolder.class, entity.getId() ); entity = ( LongStringHolder ) s.get( LongStringHolder.class, entity.getId() );
assertEquals( LONG_STRING_SIZE, entity.getLongString().length() ); assertEquals( LONG_STRING_SIZE, entity.getLongString().length() );
assertEquals( original, entity.getLongString() ); assertEquals( original, entity.getLongString() );
entity.setLongString( changed ); entity.setLongString( changed );
@ -65,7 +56,7 @@ public abstract class LongStringTest extends BaseCoreFunctionalTestCase {
s = openSession(); s = openSession();
s.beginTransaction(); s.beginTransaction();
entity = s.get( LongStringHolder.class, entity.getId() ); entity = ( LongStringHolder ) s.get( LongStringHolder.class, entity.getId() );
assertEquals( LONG_STRING_SIZE, entity.getLongString().length() ); assertEquals( LONG_STRING_SIZE, entity.getLongString().length() );
assertEquals( changed, entity.getLongString() ); assertEquals( changed, entity.getLongString() );
entity.setLongString( null ); entity.setLongString( null );
@ -74,23 +65,23 @@ public abstract class LongStringTest extends BaseCoreFunctionalTestCase {
s = openSession(); s = openSession();
s.beginTransaction(); s.beginTransaction();
entity = s.get( LongStringHolder.class, entity.getId() ); entity = ( LongStringHolder ) s.get( LongStringHolder.class, entity.getId() );
assertNull( entity.getLongString() ); assertNull( entity.getLongString() );
entity.setLongString( EMPTY ); entity.setLongString( empty );
s.getTransaction().commit(); s.getTransaction().commit();
s.close(); s.close();
s = openSession(); s = openSession();
s.beginTransaction(); s.beginTransaction();
entity = s.get( LongStringHolder.class, entity.getId() ); entity = ( LongStringHolder ) s.get( LongStringHolder.class, entity.getId() );
if ( entity.getLongString() != null ) { if ( entity.getLongString() != null ) {
if(getDialect() instanceof SybaseASE15Dialect){ if(getDialect() instanceof SybaseASE15Dialect){
//Sybase uses a single blank to denote an EMPTY string (this is by design). So, when inserting an EMPTY string '', it is interpreted as single blank ' '. //Sybase uses a single blank to denote an empty string (this is by design). So, when inserting an empty string '', it is interpreted as single blank ' '.
assertEquals( EMPTY.length(), entity.getLongString().trim().length() ); assertEquals( empty.length(), entity.getLongString().trim().length() );
assertEquals( EMPTY, entity.getLongString().trim() ); assertEquals( empty, entity.getLongString().trim() );
}else{ }else{
assertEquals( EMPTY.length(), entity.getLongString().length() ); assertEquals( empty.length(), entity.getLongString().length() );
assertEquals( EMPTY, entity.getLongString() ); assertEquals( empty, entity.getLongString() );
} }
} }
s.delete( entity ); s.delete( entity );
@ -98,51 +89,6 @@ public abstract class LongStringTest extends BaseCoreFunctionalTestCase {
s.close(); s.close();
} }
@Test
@SkipForDialect(Oracle8iDialect.class)
@TestForIssue( jiraKey = "HHH-11477")
public void testUsingLobPropertyInHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
LongStringHolder entity = new LongStringHolder();
entity.setLongString( original );
session.save( entity );
} );
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery( "from LongStringHolder where longString = :stringValue" );
query.setParameter( "stringValue", original );
final List<LongStringHolder> results = query.list();
assertThat( results.size(), is( 1 ) );
assertThat( results.get( 0 ).getLongString(), is( original ) );
} );
}
@Test
@SkipForDialect(Oracle8iDialect.class)
@TestForIssue( jiraKey = "HHH-11477")
public void testSelectLobPropertyInHqlQuery() {
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
LongStringHolder entity = new LongStringHolder();
entity.setLongString( original );
session.save( entity );
} );
TransactionUtil.doInHibernate( this::sessionFactory, session -> {
final Query query = session.createQuery( "select l.longString from LongStringHolder l where l.longString = :stringValue" );
query.setParameter( "stringValue", original );
final List<String> results = query.list();
assertThat( results.size(), is( 1 ) );
assertThat( results.get( 0 ), is( original ) );
} );
}
@Override
protected boolean isCleanupTestDataRequired() {
return true;
}
private String buildRecursively(int size, char baseChar) { private String buildRecursively(int size, char baseChar) {
StringBuilder buff = new StringBuilder(); StringBuilder buff = new StringBuilder();
for( int i = 0; i < size; i++ ) { for( int i = 0; i < size; i++ ) {

1
hibernate-core/src/test/java/org/hibernate/test/nationalized/NationalizedLobFieldTest.java
View File

@ -37,6 +37,7 @@ import static org.junit.Assert.assertThat;
@TestForIssue(jiraKey = "HHH-10364") @TestForIssue(jiraKey = "HHH-10364")
@SkipForDialect(value = DB2Dialect.class, comment = "DB2 jdbc driver doesn't support getNClob") @SkipForDialect(value = DB2Dialect.class, comment = "DB2 jdbc driver doesn't support getNClob")
@SkipForDialect(value = MySQLDialect.class, comment = "MySQL/MariadB doesn't support nclob") @SkipForDialect(value = MySQLDialect.class, comment = "MySQL/MariadB doesn't support nclob")
@SkipForDialect(value = PostgreSQL81Dialect.class, comment = "PostgreSQL doesn't support nclob")
@SkipForDialect(value = SybaseDialect.class, comment = "Sybase doesn't support nclob") @SkipForDialect(value = SybaseDialect.class, comment = "Sybase doesn't support nclob")
public class NationalizedLobFieldTest extends BaseCoreFunctionalTestCase { public class NationalizedLobFieldTest extends BaseCoreFunctionalTestCase {

2
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapLobTest.java
View File

@ -16,6 +16,7 @@ import javax.persistence.Id;
import javax.persistence.Lob; import javax.persistence.Lob;
import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.envers.Audited; import org.hibernate.envers.Audited;
import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.Priority;
@ -33,6 +34,7 @@ import static org.junit.Assert.assertEquals;
*/ */
@TestForIssue(jiraKey = "HHH-9834") @TestForIssue(jiraKey = "HHH-9834")
@SkipForDialect(Oracle8iDialect.class) @SkipForDialect(Oracle8iDialect.class)
@SkipForDialect(value = PostgreSQL81Dialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint")
public class StringMapLobTest extends BaseEnversJPAFunctionalTestCase { public class StringMapLobTest extends BaseEnversJPAFunctionalTestCase {
@Override @Override
protected Class<?>[] getAnnotatedClasses() { protected Class<?>[] getAnnotatedClasses() {

2
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMapNationalizedLobTest.java
View File

@ -17,6 +17,7 @@ import javax.persistence.Lob;
import org.hibernate.annotations.Nationalized; import org.hibernate.annotations.Nationalized;
import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.envers.Audited; import org.hibernate.envers.Audited;
import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.Priority;
@ -34,6 +35,7 @@ import static org.junit.Assert.assertEquals;
*/ */
@TestForIssue(jiraKey = "HHH-9834") @TestForIssue(jiraKey = "HHH-9834")
@SkipForDialect(Oracle8iDialect.class) @SkipForDialect(Oracle8iDialect.class)
@SkipForDialect(value = PostgreSQL81Dialect.class, jiraKey = "HHH-11477", comment = "@Lob field in HQL predicate fails with error about text = bigint")
public class StringMapNationalizedLobTest extends BaseEnversJPAFunctionalTestCase { public class StringMapNationalizedLobTest extends BaseEnversJPAFunctionalTestCase {
@Override @Override
protected Class<?>[] getAnnotatedClasses() { protected Class<?>[] getAnnotatedClasses() {