From d92e91bb4d32a225eec7c728cc7ce52ccc0b1b7e Mon Sep 17 00:00:00 2001 From: Strong Liu Date: Wed, 23 May 2012 21:28:57 +0800 Subject: [PATCH] HHH-7346 Tests fail on Postgresql due to failure in typecasts --- .../resources/hibernate.properties | 2 +- .../devguide/en-US/Database_Access.xml | 8 ++++++-- .../en-US/extras/hibernate.properties | 2 +- .../manual/en-US/content/configuration.xml | 19 ++++++++++++++----- .../hibernate/criterion/IlikeExpression.java | 3 ++- .../annotations/query/QueryAndSQLTest.java | 2 +- .../annotations/xml/ejb3/Ejb3XmlTest.java | 2 +- .../org/hibernate/test/bidi/AuctionTest.java | 2 +- .../org/hibernate/test/criteria/LikeTest.java | 3 ++- .../test/formulajoin/FormulaJoinTest.java | 3 ++- .../test/hql/ASTParserLoadingTest.java | 7 ++++--- .../java/org/hibernate/test/hql/HQLTest.java | 5 +++-- ...istChildEntitiesWithDiscriminatorTest.java | 2 +- .../hibernate/test/legacy/CustomSQLTest.java | 2 +- .../org/hibernate/test/legacy/FooBarTest.java | 5 +++-- .../hibernate/test/legacy/LegacyTestCase.java | 2 +- .../hibernate/test/legacy/SQLLoaderTest.java | 2 +- .../test/tm/TransactionTimeoutTest.java | 2 +- .../test/typeoverride/TypeOverrideTest.java | 2 +- 19 files changed, 47 insertions(+), 28 deletions(-) diff --git a/databases/postgresql84/resources/hibernate.properties b/databases/postgresql84/resources/hibernate.properties index 492f966e20..d814250eb7 100644 --- a/databases/postgresql84/resources/hibernate.properties +++ b/databases/postgresql84/resources/hibernate.properties @@ -22,7 +22,7 @@ # Boston, MA 02110-1301 USA # -hibernate.dialect org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect org.hibernate.dialect.PostgreSQL82Dialect hibernate.connection.driver_class org.postgresql.Driver hibernate.connection.url jdbc:postgresql://localhost/hibernate hibernate.connection.username hibernate diff --git a/documentation/src/main/docbook/devguide/en-US/Database_Access.xml b/documentation/src/main/docbook/devguide/en-US/Database_Access.xml index a7b75cdea0..5b42be5358 100644 --- a/documentation/src/main/docbook/devguide/en-US/Database_Access.xml +++ b/documentation/src/main/docbook/devguide/en-US/Database_Access.xml @@ -343,9 +343,13 @@ org.hibernate.dialect.PointbaseDialect - PostgreSQL - org.hibernate.dialect.PostgreSQLDialect + PostgreSQL 8.1 + org.hibernate.dialect.PostgreSQL81Dialect + + PostgreSQL 8.2 and later + org.hibernate.dialect.PostgreSQL82Dialect + Progress org.hibernate.dialect.ProgressDialect diff --git a/documentation/src/main/docbook/devguide/en-US/extras/hibernate.properties b/documentation/src/main/docbook/devguide/en-US/extras/hibernate.properties index 8eafb46829..09e5798537 100644 --- a/documentation/src/main/docbook/devguide/en-US/extras/hibernate.properties +++ b/documentation/src/main/docbook/devguide/en-US/extras/hibernate.properties @@ -6,4 +6,4 @@ hibernate.c3p0.min_size=5 hibernate.c3p0.max_size=20 hibernate.c3p0.timeout=1800 hibernate.c3p0.max_statements=50 -hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect \ No newline at end of file +hibernate.dialect = org.hibernate.dialect.PostgreSQL82Dialect \ No newline at end of file diff --git a/documentation/src/main/docbook/manual/en-US/content/configuration.xml b/documentation/src/main/docbook/manual/en-US/content/configuration.xml index 9a593e23b9..1baf0044e5 100644 --- a/documentation/src/main/docbook/manual/en-US/content/configuration.xml +++ b/documentation/src/main/docbook/manual/en-US/content/configuration.xml @@ -206,7 +206,7 @@ hibernate.c3p0.min_size=5 hibernate.c3p0.max_size=20 hibernate.c3p0.timeout=1800 hibernate.c3p0.max_statements=50 -hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect = org.hibernate.dialect.PostgreSQL82Dialect For use inside an application server, you should almost always configure Hibernate to obtain connections from an application server @@ -275,7 +275,7 @@ hibernate.transaction.factory_class = \ org.hibernate.transaction.JTATransactionFactory hibernate.transaction.manager_lookup_class = \ org.hibernate.transaction.JBossTransactionManagerLookup -hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect = org.hibernate.dialect.PostgreSQL82Dialect JDBC connections obtained from a JNDI datasource will automatically participate in the container-managed transactions of the application @@ -975,11 +975,15 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect - PostgreSQL + PostgreSQL 8.1 - org.hibernate.dialect.PostgreSQLDialect + org.hibernate.dialect.PostgreSQL81Dialect + + PostgreSQL 8.2 and later + org.hibernate.dialect.PostgreSQL82Dialect + MySQL5 @@ -1023,11 +1027,16 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect - Sybase + Sybase ASE 15.5 org.hibernate.dialect.SybaseASE15Dialect + + Sybase ASE 15.7 + + org.hibernate.dialect.SybaseASE157Dialect + Sybase Anywhere diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java index c1438f80a0..9219b98674 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java @@ -27,6 +27,7 @@ package org.hibernate.criterion; import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.engine.spi.TypedValue; @@ -57,7 +58,7 @@ public class IlikeExpression implements Criterion { if ( columns.length != 1 ) { throw new HibernateException( "ilike may only be used with single-column properties" ); } - if ( dialect instanceof PostgreSQLDialect ) { + if ( dialect instanceof PostgreSQLDialect || dialect instanceof PostgreSQL81Dialect) { return columns[0] + " ilike ?"; } else { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java index fa08ed66dc..7e99db3e96 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java @@ -354,7 +354,7 @@ public class QueryAndSQLTest extends BaseCoreFunctionalTestCase { } @Test - @SkipForDialect(value = { PostgreSQL81Dialect.class }, + @SkipForDialect(value = { PostgreSQL81Dialect.class, PostgreSQLDialect.class }, comment = "postgresql jdbc driver does not implement the setQueryTimeout method") public void testCache() throws Exception { Session s; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java index e394b23f61..21a2308357 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull; */ public class Ejb3XmlTest extends BaseCoreFunctionalTestCase { @Test - @SkipForDialect(value = { PostgreSQL81Dialect.class }, + @SkipForDialect(value = { PostgreSQL81Dialect.class, PostgreSQLDialect.class }, comment = "postgresql jdbc driver does not implement the setQueryTimeout method") public void testEjb3Xml() throws Exception { Session s = openSession(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest.java index 708093b484..b4e32a3876 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/bidi/AuctionTest.java @@ -49,7 +49,7 @@ public class AuctionTest extends BaseCoreFunctionalTestCase { @Test @SuppressWarnings( {"unchecked"}) - @SkipForDialect( value = PostgreSQL81Dialect.class, comment = "doesn't like boolean=1" ) + @SkipForDialect( value = {PostgreSQL81Dialect.class, PostgreSQLDialect.class}, comment = "doesn't like boolean=1" ) public void testLazy() { Session s = openSession(); Transaction t = s.beginTransaction(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/LikeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/criteria/LikeTest.java index 42849207d9..d962dcb534 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/LikeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/criteria/LikeTest.java @@ -30,6 +30,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -67,7 +68,7 @@ public class LikeTest extends BaseCoreFunctionalTestCase { assertEquals( 1, objects.size() ); session.clear(); - if ( !( getDialect() instanceof MySQLDialect ) && ! ( getDialect() instanceof PostgreSQLDialect )) { + if ( !( getDialect() instanceof MySQLDialect ) && ! ( getDialect() instanceof PostgreSQLDialect ) && ! ( getDialect() instanceof PostgreSQL81Dialect )) { // retrieve object - case insensitive via custom expression - works // ok objects = session.createCriteria( TestObject.class ).add( diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/FormulaJoinTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/FormulaJoinTest.java index 3bf3f7938b..6f95c2eb91 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/FormulaJoinTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/formulajoin/FormulaJoinTest.java @@ -28,6 +28,7 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -65,7 +66,7 @@ public class FormulaJoinTest extends BaseCoreFunctionalTestCase { tx.commit(); s.close(); - if ( getDialect() instanceof PostgreSQLDialect ) return; + if ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect ) return; s = openSession(); tx = s.beginTransaction(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingTest.java index a7b2f48972..f7484f71e1 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/ASTParserLoadingTest.java @@ -53,6 +53,7 @@ import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServer2008Dialect; import org.hibernate.dialect.SQLServerDialect; @@ -451,7 +452,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { else { s.createQuery( "from Animal where lower(upper('foo') || upper(:bar)) like 'f%'" ).setString( "bar", "xyz" ).list(); } - if ( ! ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof MySQLDialect ) ) { + if ( ! ( getDialect() instanceof PostgreSQLDialect|| getDialect() instanceof PostgreSQL81Dialect || getDialect() instanceof MySQLDialect ) ) { s.createQuery( "from Animal where abs(cast(1 as float) - cast(:param as float)) = 1.0" ).setLong( "param", 1 ).list(); } s.getTransaction().commit(); @@ -2751,7 +2752,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { * PostgreSQL >= 8.3.7 typecasts are no longer automatically allowed * http://www.postgresql.org/docs/current/static/release-8-3.html */ - if(getDialect() instanceof PostgreSQLDialect || getDialect() instanceof HSQLDialect){ + if(getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect || getDialect() instanceof HSQLDialect){ hql = "from Animal a where bit_length(str(a.bodyWeight)) = 24"; } else{ @@ -2759,7 +2760,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } session.createQuery(hql).list(); - if(getDialect() instanceof PostgreSQLDialect || getDialect() instanceof HSQLDialect){ + if(getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect || getDialect() instanceof HSQLDialect){ hql = "select bit_length(str(a.bodyWeight)) from Animal a"; }else{ hql = "select bit_length(a.bodyWeight) from Animal a"; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/HQLTest.java index d10b166ce4..ddda76c903 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/HQLTest.java @@ -41,6 +41,7 @@ import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.Sybase11Dialect; @@ -354,7 +355,7 @@ public class HQLTest extends QueryTranslatorTestCase { if ( !( getDialect() instanceof MySQLDialect ) && ! ( getDialect() instanceof SybaseDialect ) && ! ( getDialect() instanceof Sybase11Dialect ) && !( getDialect() instanceof SybaseASE15Dialect ) && ! ( getDialect() instanceof SybaseAnywhereDialect ) && ! ( getDialect() instanceof SQLServerDialect ) ) { assertTranslation("from Animal where lower(upper('foo') || upper(:bar)) like 'f%'"); } - if ( getDialect() instanceof PostgreSQLDialect ) { + if ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect ) { return; } assertTranslation("from Animal where abs(cast(1 as float) - cast(:param as float)) = 1.0"); @@ -838,7 +839,7 @@ public class HQLTest extends QueryTranslatorTestCase { @Test public void testGroupByFunction() { if ( getDialect() instanceof Oracle8iDialect ) return; // the new hiearchy... - if ( getDialect() instanceof PostgreSQLDialect ) return; + if ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect ) return; if ( ! H2Dialect.class.isInstance( getDialect() ) ) { // H2 has no year function assertTranslation( "select count(*) from Human h group by year(h.birthdate)" ); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java index 681b0fc689..108ac5becc 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java @@ -34,7 +34,7 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** * @author Pawel Stawicki */ -@RequiresDialect( value = PostgreSQL81Dialect.class, jiraKey = "HHH-6580" ) +@RequiresDialect( value = {PostgreSQL81Dialect.class, PostgreSQLDialect.class}, jiraKey = "HHH-6580" ) public class PersistChildEntitiesWithDiscriminatorTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQLTest.java index 9946afda82..a62a6a3d6a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQLTest.java @@ -40,7 +40,7 @@ public class CustomSQLTest extends LegacyTestCase { @Test @RequiresDialectFeature( NonIdentityGeneratorChecker.class ) - @SkipForDialect( value = PostgreSQL81Dialect.class, jiraKey = "HHH-6704") + @SkipForDialect( value = {PostgreSQL81Dialect.class, PostgreSQLDialect.class}, jiraKey = "HHH-6704") @SuppressWarnings( {"UnnecessaryBoxing"}) public void testInsert() throws HibernateException, SQLException { Session s = openSession(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java index 438badd4ed..121cb08d82 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java @@ -71,6 +71,7 @@ import org.hibernate.dialect.MckoiDialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.PointbaseDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SAPDBDialect; import org.hibernate.dialect.Sybase11Dialect; @@ -2293,7 +2294,7 @@ public class FooBarTest extends LegacyTestCase { s.createQuery( "select count(*) from Baz as baz where 1 in indices(baz.fooArray)" ).list(); s.createQuery( "select count(*) from Bar as bar where 'abc' in elements(bar.baz.fooArray)" ).list(); s.createQuery( "select count(*) from Bar as bar where 1 in indices(bar.baz.fooArray)" ).list(); - if ( !(getDialect() instanceof DB2Dialect) && !(getDialect() instanceof Oracle8iDialect ) && !( getDialect() instanceof SybaseDialect ) && !( getDialect() instanceof Sybase11Dialect ) && !( getDialect() instanceof SybaseASE15Dialect ) && !( getDialect() instanceof PostgreSQLDialect )) { + if ( !(getDialect() instanceof DB2Dialect) && !(getDialect() instanceof Oracle8iDialect ) && !( getDialect() instanceof SybaseDialect ) && !( getDialect() instanceof Sybase11Dialect ) && !( getDialect() instanceof SybaseASE15Dialect ) && !( getDialect() instanceof PostgreSQLDialect ) && !(getDialect() instanceof PostgreSQL81Dialect)) { // SybaseAnywhereDialect supports implicit conversions from strings to ints s.createQuery( "select count(*) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)" @@ -2368,7 +2369,7 @@ public class FooBarTest extends LegacyTestCase { s.delete(bar); - if ( getDialect() instanceof DB2Dialect || getDialect() instanceof PostgreSQLDialect ) { + if ( getDialect() instanceof DB2Dialect || getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect ) { s.createQuery( "select one from One one join one.manies many group by one order by count(many)" ).iterate(); s.createQuery( "select one from One one join one.manies many group by one having count(many) < 5" ) .iterate(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java index e0f34b84ac..e88393d175 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java @@ -57,7 +57,7 @@ public abstract class LegacyTestCase extends BaseCoreFunctionalTestCase { protected boolean supportsLockingNullableSideOfJoin(Dialect dialect) { // db2 and pgsql do *NOT* - return ! ( DB2Dialect.class.isInstance( dialect ) || PostgreSQL81Dialect.class.isInstance( dialect ) ); + return ! ( DB2Dialect.class.isInstance( dialect ) || PostgreSQL81Dialect.class.isInstance( dialect ) || PostgreSQLDialect.class.isInstance( dialect )); } protected static String extractFromSystem(String systemPropertyName) { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLLoaderTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLLoaderTest.java index 7b0a6ef648..40f222989b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLLoaderTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SQLLoaderTest.java @@ -374,7 +374,7 @@ public class SQLLoaderTest extends LegacyTestCase { } @Test - @SkipForDialect( { HSQLDialect.class, PostgreSQL81Dialect.class } ) + @SkipForDialect( { HSQLDialect.class, PostgreSQL81Dialect.class, PostgreSQLDialect.class } ) public void testEscapedJDBC() throws HibernateException, SQLException { Session session = openSession(); session.beginTransaction(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java index 6220eeba07..69448207fc 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotSame; * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ @TestForIssue(jiraKey = "HHH-6780") -@SkipForDialect( value = PostgreSQL81Dialect.class, comment = "PostgreSQL jdbc driver doesn't impl timeout method") +@SkipForDialect( value ={ PostgreSQL81Dialect.class, PostgreSQLDialect.class}, comment = "PostgreSQL jdbc driver doesn't impl timeout method") public class TransactionTimeoutTest extends BaseCoreFunctionalTestCase { @Override public String[] getMappings() { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java index 6c73607a63..03a42201af 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java @@ -70,7 +70,7 @@ public class TypeOverrideTest extends BaseCoreFunctionalTestCase { getDialect().remapSqlTypeDescriptor( BlobTypeDescriptor.DEFAULT ) ); } - else if ( PostgreSQL81Dialect.class.isInstance( getDialect() ) ) { + else if ( PostgreSQL81Dialect.class.isInstance( getDialect() ) || PostgreSQLDialect.class.isInstance( getDialect() ) ) { assertSame( BlobTypeDescriptor.BLOB_BINDING, getDialect().remapSqlTypeDescriptor( BlobTypeDescriptor.DEFAULT )