Skip to content

Commit

Permalink
Use new parent PostgreSQLDialect for @RequiresDialect rather than sub…
Browse files Browse the repository at this point in the history 
…class
  • Loading branch information
@beikov
beikov committed Dec 17, 2020
1 parent 9770b49 commit cb7c65e
Show file tree
Hide file tree
Showing 24 changed files with 59 additions and 58 deletions.
4 changes: 2 additions & 2 deletions documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java
View file
Expand Up @@ -13,7 +13,7 @@
import javax.persistence.Table;

import org.hibernate.annotations.JoinFormula;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

import org.hibernate.testing.RequiresDialect;
Expand All @@ -27,7 +27,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class JoinFormulaTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
10 changes: 5 additions & 5 deletions documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java
View file
Expand Up @@ -28,7 +28,7 @@
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.MySQL5Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.type.StringType;
Expand Down Expand Up @@ -1917,7 +1917,7 @@ public void test_hql_relational_comparisons_example_2() {

@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
@RequiresDialect(MySQL5Dialect.class)
public void test_hql_relational_comparisons_example_3() {

Expand Down Expand Up @@ -2122,7 +2122,7 @@ public void test_hql_between_predicate_example_1() {

@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
@RequiresDialect(MySQL5Dialect.class)
public void test_hql_between_predicate_example_2() {

Expand Down Expand Up @@ -2379,7 +2379,7 @@ public void test_hql_group_by_example_2() {

@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
@RequiresDialect(MySQL5Dialect.class)
public void test_hql_group_by_example_3() {

Expand All @@ -2401,7 +2401,7 @@ public void test_hql_group_by_example_3() {

@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
@RequiresDialect(MySQL5Dialect.class)
public void test_hql_group_by_example_4() {

Expand Down
4 changes: 2 additions & 2 deletions ...ntation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java
View file
Expand Up @@ -15,7 +15,7 @@

import org.hibernate.Session;
import org.hibernate.boot.spi.MetadataBuilderContributor;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.function.StandardSQLFunction;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.type.StandardBasicTypes;
Expand All @@ -30,7 +30,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLFunctionSelectClauseTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...entation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java
View file
Expand Up @@ -12,7 +12,7 @@
import javax.persistence.Id;

import org.hibernate.Session;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

import org.hibernate.testing.RequiresDialect;
Expand All @@ -26,7 +26,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLFunctionWhereClauseTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...ation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java
View file
Expand Up @@ -11,7 +11,7 @@
import javax.persistence.Table;

import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

import org.hibernate.testing.RequiresDialect;
Expand All @@ -20,7 +20,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class EntityTableSchemaTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java
View file
Expand Up @@ -25,7 +25,7 @@
import org.hibernate.annotations.SQLInsert;
import org.hibernate.annotations.SQLUpdate;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

import org.hibernate.testing.RequiresDialect;
Expand All @@ -44,7 +44,7 @@
* @author Vlad Mihalcea
*/
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class CollectionLoaderTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java
View file
Expand Up @@ -23,7 +23,7 @@
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.SQLInsert;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

import org.hibernate.testing.RequiresDialect;
Expand All @@ -40,7 +40,7 @@
* @author Vlad Mihalcea
*/
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class CustomSQLSecondaryTableTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java
View file
Expand Up @@ -25,7 +25,7 @@
import org.hibernate.annotations.SQLUpdate;
import org.hibernate.annotations.Where;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

import org.hibernate.testing.RequiresDialect;
Expand All @@ -42,7 +42,7 @@
* @author Vlad Mihalcea
*/
@RequiresDialect(H2Dialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class CustomSQLTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
10 changes: 5 additions & 5 deletions documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java
View file
Expand Up @@ -16,7 +16,7 @@
import org.hibernate.Session;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.loader.NonUniqueDiscoveredSqlAliasException;
import org.hibernate.transform.DistinctRootEntityResultTransformer;
Expand Down Expand Up @@ -398,7 +398,7 @@ public void test_sql_hibernate_entity_associations_query_many_to_one_join_result
@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(Oracle8iDialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void test_sql_jpa_entity_associations_query_one_to_many_join_example() {
doInJPA( this::entityManagerFactory, entityManager -> {
//tag::sql-jpa-entity-associations-query-one-to-many-join-example[]
Expand Down Expand Up @@ -445,7 +445,7 @@ public void test_sql_hibernate_entity_associations_query_one_to_many_join_exampl
@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(Oracle8iDialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void test_sql_hibernate_entity_associations_query_one_to_many_join_example_2() {
doInJPA( this::entityManagerFactory, entityManager -> {
Session session = entityManager.unwrap( Session.class );
Expand Down Expand Up @@ -721,7 +721,7 @@ public void test_sql_hibernate_entity_named_query_example() {
@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(Oracle8iDialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void test_sql_jpa_entity_associations_named_query_example() {
doInJPA( this::entityManagerFactory, entityManager -> {
//tag::sql-jpa-entity-associations_named-query-example[]
Expand All @@ -742,7 +742,7 @@ public void test_sql_jpa_entity_associations_named_query_example() {
@Test
@RequiresDialect(H2Dialect.class)
@RequiresDialect(Oracle8iDialect.class)
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void test_sql_hibernate_entity_associations_named_query_example() {
doInJPA( this::entityManagerFactory, entityManager -> {
Session session = entityManager.unwrap( Session.class );
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/test/java/org/hibernate/jpa/test/lock/NativeSQLQueryTimeoutTest.java
View file
Expand Up @@ -7,7 +7,7 @@
package org.hibernate.jpa.test.lock;

import org.hibernate.dialect.CockroachDialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.QueryHints;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.testing.RequiresDialect;
Expand All @@ -25,7 +25,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
@SkipForDialect(value = CockroachDialect.class, comment = "https://github.com/cockroachdb/cockroach/issues/41335")
@TestForIssue( jiraKey = "HHH-13493")
public class NativeSQLQueryTimeoutTest extends BaseEntityManagerFunctionalTestCase {
Expand Down
4 changes: 2 additions & 2 deletions ...test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java
View file
Expand Up @@ -18,7 +18,7 @@
import org.hibernate.HibernateException;
import org.hibernate.annotations.TypeDef;
import org.hibernate.boot.spi.MetadataBuilderContributor;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.query.NativeQuery;
Expand All @@ -40,7 +40,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLMultipleTypesOtherContributorTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...est/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java
View file
Expand Up @@ -17,7 +17,7 @@
import org.hibernate.annotations.TypeDef;
import org.hibernate.boot.MetadataBuilder;
import org.hibernate.boot.spi.MetadataBuilderContributor;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.query.NativeQuery;
Expand All @@ -31,7 +31,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLInetTypesOtherContributorTest extends PostgreSQLInetTypesOtherTest {

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java
View file
Expand Up @@ -8,7 +8,7 @@

import java.util.List;

import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.query.NativeQuery;

Expand All @@ -23,7 +23,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLInetTypesOtherTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...rnate-core/src/test/java/org/hibernate/test/id/uuid/PostgreSQLUUIDGeneratedValueTest.java
View file
Expand Up @@ -12,7 +12,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.Id;

import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.query.NativeQuery;
import org.hibernate.type.PostgresUUIDType;
Expand All @@ -28,7 +28,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL82Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLUUIDGeneratedValueTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down
12 changes: 6 additions & 6 deletions hibernate-core/src/test/java/org/hibernate/test/lob/LobStringTest.java
View file
Expand Up @@ -18,7 +18,7 @@
import javax.persistence.Table;

import org.hibernate.dialect.CockroachDialect;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.query.Query;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.TestForIssue;
Expand All @@ -34,7 +34,7 @@
* @author Andrea Boriero
*/
@TestForIssue(jiraKey = "HHH-11477")
@RequiresDialect({ PostgreSQL81Dialect.class, CockroachDialect.class })
@RequiresDialect({ PostgreSQLDialect.class, CockroachDialect.class })
public class LobStringTest extends BaseCoreFunctionalTestCase {

private static final int LONG_STRING_SIZE = 3999;
Expand Down Expand Up @@ -90,7 +90,7 @@ public void testHqlQuery() {

@Test
@TestForIssue(jiraKey = "HHH-11477")
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void testUsingStringLobAnnotatedPropertyInNativeQuery() {
doInHibernate( this::sessionFactory, session -> {
final List<TestEntity> results = session.createNativeQuery(
Expand All @@ -117,7 +117,7 @@ public void testUsingStringLobAnnotatedPropertyInNativeQuery() {

@Test
@TestForIssue(jiraKey = "HHH-11477")
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void testSelectStringLobAnnotatedInNativeQuery() {
doInHibernate( this::sessionFactory, session -> {
final List<String> results = session.createNativeQuery(
Expand All @@ -135,7 +135,7 @@ public void testSelectStringLobAnnotatedInNativeQuery() {

@Test
@TestForIssue(jiraKey = "HHH-11477")
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void testUsingLobPropertyInNativeQuery() {
doInHibernate( this::sessionFactory, session -> {
final List<String> results = session.createNativeQuery(
Expand All @@ -153,7 +153,7 @@ public void testUsingLobPropertyInNativeQuery() {

@Test
@TestForIssue(jiraKey = "HHH-11477")
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public void testSelectClobPropertyInNativeQuery() {
doInHibernate( this::sessionFactory, session -> {
final List<byte[]> results = session.createNativeQuery(
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/test/java/org/hibernate/test/lob/PostgreSqlLobStringTest.java
View file
Expand Up @@ -18,7 +18,7 @@
import javax.persistence.Lob;
import javax.persistence.Table;

import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.query.Query;

import org.hibernate.testing.*;
Expand All @@ -37,7 +37,7 @@
* @author Andrea Boriero
*/
@TestForIssue(jiraKey = "HHH-11614")
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSqlLobStringTest extends BaseCoreFunctionalTestCase {

private final String value1 = "abc";
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java
View file
Expand Up @@ -19,7 +19,7 @@
import javax.persistence.ParameterMode;
import javax.persistence.StoredProcedureQuery;
import org.hibernate.Session;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.procedure.ProcedureCall;
import org.hibernate.testing.RequiresDialect;
Expand All @@ -37,7 +37,7 @@
/**
* @author Vlad Mihalcea
*/
@RequiresDialect(PostgreSQL81Dialect.class)
@RequiresDialect(PostgreSQLDialect.class)
public class PostgreSQLStoredProcedureTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand Down

0 comments on commit cb7c65e

Please sign in to comment.