diff --git a/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java index 34919bc64..8c359b2f8 100644 --- a/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java +++ b/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java @@ -14,6 +14,8 @@ import org.hibernate.dialect.*; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.ServiceRegistry; +import org.hibernate.type.BasicType; +import org.hibernate.usertype.UserType; /** * The {@link HibernateTypesContributor} registers various types automatically. @@ -30,47 +32,66 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv if(dialect instanceof PostgreSQLDialect) { /* Arrays */ - typeContributions.contributeType(BooleanArrayType.INSTANCE); - typeContributions.contributeType(DateArrayType.INSTANCE); - typeContributions.contributeType(DecimalArrayType.INSTANCE); - typeContributions.contributeType(DoubleArrayType.INSTANCE); - typeContributions.contributeType(EnumArrayType.INSTANCE); - typeContributions.contributeType(IntArrayType.INSTANCE); - typeContributions.contributeType(DoubleArrayType.INSTANCE); - typeContributions.contributeType(ListArrayType.INSTANCE); - typeContributions.contributeType(LongArrayType.INSTANCE); - typeContributions.contributeType(StringArrayType.INSTANCE); - typeContributions.contributeType(TimestampArrayType.INSTANCE); - typeContributions.contributeType(UUIDArrayType.INSTANCE); - + this + .contributeType(typeContributions, BooleanArrayType.INSTANCE) + .contributeType(typeContributions, DateArrayType.INSTANCE) + .contributeType(typeContributions, DecimalArrayType.INSTANCE) + .contributeType(typeContributions, DoubleArrayType.INSTANCE) + .contributeType(typeContributions, EnumArrayType.INSTANCE) + .contributeType(typeContributions, IntArrayType.INSTANCE) + .contributeType(typeContributions, DoubleArrayType.INSTANCE) + .contributeType(typeContributions, ListArrayType.INSTANCE) + .contributeType(typeContributions, LongArrayType.INSTANCE) + .contributeType(typeContributions, StringArrayType.INSTANCE) + .contributeType(typeContributions, TimestampArrayType.INSTANCE) + .contributeType(typeContributions, UUIDArrayType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonBinaryType.INSTANCE); + .contributeType(typeContributions, JsonBinaryType.INSTANCE) /* Specific-types */ - typeContributions.contributeType(PostgreSQLEnumType.INSTANCE); - typeContributions.contributeType(PostgreSQLHStoreType.INSTANCE); - typeContributions.contributeType(PostgreSQLInetType.INSTANCE); - typeContributions.contributeType(PostgreSQLRangeType.INSTANCE); + .contributeType(typeContributions, PostgreSQLEnumType.INSTANCE) + .contributeType(typeContributions, PostgreSQLHStoreType.INSTANCE) + .contributeType(typeContributions, PostgreSQLInetType.INSTANCE) + .contributeType(typeContributions, PostgreSQLRangeType.INSTANCE); if(ReflectionUtils.getClassOrNull("com.google.common.collect.Range") != null) { - typeContributions.contributeType(PostgreSQLGuavaRangeType.INSTANCE); + this.contributeType(typeContributions, PostgreSQLGuavaRangeType.INSTANCE); } } else if(dialect instanceof MySQLDialect) { /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); - typeContributions.contributeType(JsonNodeStringType.INSTANCE); + this + .contributeType(typeContributions, JsonStringType.INSTANCE) + .contributeType(typeContributions, JsonNodeStringType.INSTANCE); } else if(dialect instanceof SQLServerDialect) { /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); + this + .contributeType(typeContributions, JsonStringType.INSTANCE); } else if(dialect instanceof OracleDialect) { + /* Date/Time */ + this /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); - typeContributions.contributeType(JsonBlobType.INSTANCE); + .contributeType(typeContributions, JsonStringType.INSTANCE) + .contributeType(typeContributions, JsonBlobType.INSTANCE); } /* Basic */ - typeContributions.contributeType(NullableCharacterType.INSTANCE); + this.contributeType(typeContributions, NullableCharacterType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonType.INSTANCE); + .contributeType(typeContributions, JsonType.INSTANCE); + } + + private HibernateTypesContributor contributeType(TypeContributions typeContributions, BasicType type) { + typeContributions.contributeType(type); + return this; + } + + private HibernateTypesContributor contributeType(TypeContributions typeContributions, UserType type) { + if(type instanceof ImmutableType) { + ImmutableType immutableType = (ImmutableType) type; + typeContributions.contributeType(immutableType, immutableType.getName()); + } else { + typeContributions.contributeType(type, type.getClass().getSimpleName()); + } + return this; } } diff --git a/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java index aa3ab3c21..d7172aaee 100644 --- a/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java +++ b/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java @@ -15,6 +15,8 @@ import org.hibernate.dialect.*; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.ServiceRegistry; +import org.hibernate.type.BasicType; +import org.hibernate.usertype.UserType; /** * The {@link HibernateTypesContributor} registers various types automatically. @@ -31,64 +33,81 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv if(dialect instanceof PostgreSQLDialect) { /* Arrays */ - typeContributions.contributeType(BooleanArrayType.INSTANCE); - typeContributions.contributeType(DateArrayType.INSTANCE); - typeContributions.contributeType(DecimalArrayType.INSTANCE); - typeContributions.contributeType(DoubleArrayType.INSTANCE); - typeContributions.contributeType(EnumArrayType.INSTANCE); - typeContributions.contributeType(IntArrayType.INSTANCE); - typeContributions.contributeType(DoubleArrayType.INSTANCE); - typeContributions.contributeType(ListArrayType.INSTANCE); - typeContributions.contributeType(LocalDateArrayType.INSTANCE); - typeContributions.contributeType(LocalDateTimeArrayType.INSTANCE); - typeContributions.contributeType(LongArrayType.INSTANCE); - typeContributions.contributeType(StringArrayType.INSTANCE); - typeContributions.contributeType(TimestampArrayType.INSTANCE); - typeContributions.contributeType(UUIDArrayType.INSTANCE); - + this + .contributeType(typeContributions, BooleanArrayType.INSTANCE) + .contributeType(typeContributions, DateArrayType.INSTANCE) + .contributeType(typeContributions, DecimalArrayType.INSTANCE) + .contributeType(typeContributions, DoubleArrayType.INSTANCE) + .contributeType(typeContributions, EnumArrayType.INSTANCE) + .contributeType(typeContributions, IntArrayType.INSTANCE) + .contributeType(typeContributions, DoubleArrayType.INSTANCE) + .contributeType(typeContributions, ListArrayType.INSTANCE) + .contributeType(typeContributions, LocalDateArrayType.INSTANCE) + .contributeType(typeContributions, LocalDateTimeArrayType.INSTANCE) + .contributeType(typeContributions, LongArrayType.INSTANCE) + .contributeType(typeContributions, StringArrayType.INSTANCE) + .contributeType(typeContributions, TimestampArrayType.INSTANCE) + .contributeType(typeContributions, UUIDArrayType.INSTANCE) /* Date/Time */ - typeContributions.contributeType(PostgreSQLIntervalType.INSTANCE); - typeContributions.contributeType(PostgreSQLPeriodType.INSTANCE); - + .contributeType(typeContributions, PostgreSQLIntervalType.INSTANCE) + .contributeType(typeContributions, PostgreSQLPeriodType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonBinaryType.INSTANCE); + .contributeType(typeContributions, JsonBinaryType.INSTANCE) /* Specific-types */ - typeContributions.contributeType(PostgreSQLTSVectorType.INSTANCE); - typeContributions.contributeType(PostgreSQLEnumType.INSTANCE); - typeContributions.contributeType(PostgreSQLHStoreType.INSTANCE); - typeContributions.contributeType(PostgreSQLInetType.INSTANCE); - typeContributions.contributeType(PostgreSQLRangeType.INSTANCE); + .contributeType(typeContributions, PostgreSQLTSVectorType.INSTANCE) + .contributeType(typeContributions, PostgreSQLEnumType.INSTANCE) + .contributeType(typeContributions, PostgreSQLHStoreType.INSTANCE) + .contributeType(typeContributions, PostgreSQLInetType.INSTANCE) + .contributeType(typeContributions, PostgreSQLRangeType.INSTANCE); if(ReflectionUtils.getClassOrNull("com.google.common.collect.Range") != null) { - typeContributions.contributeType(PostgreSQLGuavaRangeType.INSTANCE); + this.contributeType(typeContributions, PostgreSQLGuavaRangeType.INSTANCE); } } else if(dialect instanceof MySQLDialect) { /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); - typeContributions.contributeType(JsonNodeStringType.INSTANCE); + this + .contributeType(typeContributions, JsonStringType.INSTANCE) + .contributeType(typeContributions, JsonNodeStringType.INSTANCE); } else if(dialect instanceof SQLServerDialect) { /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); + this + .contributeType(typeContributions, JsonStringType.INSTANCE); } else if(dialect instanceof OracleDialect) { /* Date/Time */ - typeContributions.contributeType(OracleIntervalDayToSecondType.INSTANCE); + this + .contributeType(typeContributions, OracleIntervalDayToSecondType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); - typeContributions.contributeType(JsonBlobType.INSTANCE); + .contributeType(typeContributions, JsonStringType.INSTANCE) + .contributeType(typeContributions, JsonBlobType.INSTANCE); } /* Basic */ - typeContributions.contributeType(NullableCharacterType.INSTANCE); + this.contributeType(typeContributions, NullableCharacterType.INSTANCE) /* Date/Time */ - typeContributions.contributeType(Iso8601MonthType.INSTANCE); - typeContributions.contributeType(MonthDayDateType.INSTANCE); - typeContributions.contributeType(MonthDayIntegerType.INSTANCE); - typeContributions.contributeType(YearMonthDateType.INSTANCE); - typeContributions.contributeType(YearMonthEpochType.INSTANCE); - typeContributions.contributeType(YearMonthIntegerType.INSTANCE); - typeContributions.contributeType(YearMonthTimestampType.INSTANCE); + .contributeType(typeContributions, Iso8601MonthType.INSTANCE) + .contributeType(typeContributions, MonthDayDateType.INSTANCE) + .contributeType(typeContributions, MonthDayIntegerType.INSTANCE) + .contributeType(typeContributions, YearMonthDateType.INSTANCE) + .contributeType(typeContributions, YearMonthEpochType.INSTANCE) + .contributeType(typeContributions, YearMonthIntegerType.INSTANCE) + .contributeType(typeContributions, YearMonthTimestampType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonType.INSTANCE); + .contributeType(typeContributions, JsonType.INSTANCE); + } + + private HibernateTypesContributor contributeType(TypeContributions typeContributions, BasicType type) { + typeContributions.contributeType(type); + return this; + } + + private HibernateTypesContributor contributeType(TypeContributions typeContributions, UserType type) { + if(type instanceof ImmutableType) { + ImmutableType immutableType = (ImmutableType) type; + typeContributions.contributeType(immutableType, immutableType.getName()); + } else { + typeContributions.contributeType(type, type.getClass().getSimpleName()); + } + return this; } } diff --git a/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java index aa3ab3c21..da93bffba 100644 --- a/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java +++ b/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java @@ -15,6 +15,8 @@ import org.hibernate.dialect.*; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.ServiceRegistry; +import org.hibernate.type.BasicType; +import org.hibernate.usertype.UserType; /** * The {@link HibernateTypesContributor} registers various types automatically. @@ -31,64 +33,81 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv if(dialect instanceof PostgreSQLDialect) { /* Arrays */ - typeContributions.contributeType(BooleanArrayType.INSTANCE); - typeContributions.contributeType(DateArrayType.INSTANCE); - typeContributions.contributeType(DecimalArrayType.INSTANCE); - typeContributions.contributeType(DoubleArrayType.INSTANCE); - typeContributions.contributeType(EnumArrayType.INSTANCE); - typeContributions.contributeType(IntArrayType.INSTANCE); - typeContributions.contributeType(DoubleArrayType.INSTANCE); - typeContributions.contributeType(ListArrayType.INSTANCE); - typeContributions.contributeType(LocalDateArrayType.INSTANCE); - typeContributions.contributeType(LocalDateTimeArrayType.INSTANCE); - typeContributions.contributeType(LongArrayType.INSTANCE); - typeContributions.contributeType(StringArrayType.INSTANCE); - typeContributions.contributeType(TimestampArrayType.INSTANCE); - typeContributions.contributeType(UUIDArrayType.INSTANCE); - + this + .contributeType(typeContributions, BooleanArrayType.INSTANCE) + .contributeType(typeContributions, DateArrayType.INSTANCE) + .contributeType(typeContributions, DecimalArrayType.INSTANCE) + .contributeType(typeContributions, DoubleArrayType.INSTANCE) + .contributeType(typeContributions, EnumArrayType.INSTANCE) + .contributeType(typeContributions, IntArrayType.INSTANCE) + .contributeType(typeContributions, DoubleArrayType.INSTANCE) + .contributeType(typeContributions, ListArrayType.INSTANCE) + .contributeType(typeContributions, LocalDateArrayType.INSTANCE) + .contributeType(typeContributions, LocalDateTimeArrayType.INSTANCE) + .contributeType(typeContributions, LongArrayType.INSTANCE) + .contributeType(typeContributions, StringArrayType.INSTANCE) + .contributeType(typeContributions, TimestampArrayType.INSTANCE) + .contributeType(typeContributions, UUIDArrayType.INSTANCE) /* Date/Time */ - typeContributions.contributeType(PostgreSQLIntervalType.INSTANCE); - typeContributions.contributeType(PostgreSQLPeriodType.INSTANCE); - + .contributeType(typeContributions, PostgreSQLIntervalType.INSTANCE) + .contributeType(typeContributions, PostgreSQLPeriodType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonBinaryType.INSTANCE); + .contributeType(typeContributions, JsonBinaryType.INSTANCE) /* Specific-types */ - typeContributions.contributeType(PostgreSQLTSVectorType.INSTANCE); - typeContributions.contributeType(PostgreSQLEnumType.INSTANCE); - typeContributions.contributeType(PostgreSQLHStoreType.INSTANCE); - typeContributions.contributeType(PostgreSQLInetType.INSTANCE); - typeContributions.contributeType(PostgreSQLRangeType.INSTANCE); + .contributeType(typeContributions, PostgreSQLTSVectorType.INSTANCE) + .contributeType(typeContributions, PostgreSQLEnumType.INSTANCE) + .contributeType(typeContributions, PostgreSQLHStoreType.INSTANCE) + .contributeType(typeContributions, PostgreSQLInetType.INSTANCE) + .contributeType(typeContributions, PostgreSQLRangeType.INSTANCE); if(ReflectionUtils.getClassOrNull("com.google.common.collect.Range") != null) { - typeContributions.contributeType(PostgreSQLGuavaRangeType.INSTANCE); + this.contributeType(typeContributions, PostgreSQLGuavaRangeType.INSTANCE); } } else if(dialect instanceof MySQLDialect) { /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); - typeContributions.contributeType(JsonNodeStringType.INSTANCE); + this + .contributeType(typeContributions, JsonStringType.INSTANCE) + .contributeType(typeContributions, JsonNodeStringType.INSTANCE); } else if(dialect instanceof SQLServerDialect) { /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); + this + .contributeType(typeContributions, JsonStringType.INSTANCE); } else if(dialect instanceof OracleDialect) { /* Date/Time */ - typeContributions.contributeType(OracleIntervalDayToSecondType.INSTANCE); + this + .contributeType(typeContributions, OracleIntervalDayToSecondType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonStringType.INSTANCE); - typeContributions.contributeType(JsonBlobType.INSTANCE); + .contributeType(typeContributions, JsonStringType.INSTANCE) + .contributeType(typeContributions, JsonBlobType.INSTANCE); } /* Basic */ - typeContributions.contributeType(NullableCharacterType.INSTANCE); + this.contributeType(typeContributions, NullableCharacterType.INSTANCE) /* Date/Time */ - typeContributions.contributeType(Iso8601MonthType.INSTANCE); - typeContributions.contributeType(MonthDayDateType.INSTANCE); - typeContributions.contributeType(MonthDayIntegerType.INSTANCE); - typeContributions.contributeType(YearMonthDateType.INSTANCE); - typeContributions.contributeType(YearMonthEpochType.INSTANCE); - typeContributions.contributeType(YearMonthIntegerType.INSTANCE); - typeContributions.contributeType(YearMonthTimestampType.INSTANCE); + .contributeType(typeContributions, Iso8601MonthType.INSTANCE) + .contributeType(typeContributions, MonthDayDateType.INSTANCE) + .contributeType(typeContributions, MonthDayIntegerType.INSTANCE) + .contributeType(typeContributions, YearMonthDateType.INSTANCE) + .contributeType(typeContributions, YearMonthEpochType.INSTANCE) + .contributeType(typeContributions, YearMonthIntegerType.INSTANCE) + .contributeType(typeContributions, YearMonthTimestampType.INSTANCE) /* JSON */ - typeContributions.contributeType(JsonType.INSTANCE); + .contributeType(typeContributions, JsonType.INSTANCE); + } + + private HibernateTypesContributor contributeType(TypeContributions typeContributions, BasicType type) { + typeContributions.contributeType(type); + return this; + } + + private HibernateTypesContributor contributeType(TypeContributions typeContributions, UserType type) { + if(type instanceof ImmutableType) { + ImmutableType immutableType = (ImmutableType) type; + typeContributions.contributeType(immutableType, immutableType.getName()); + } else { + typeContributions.contributeType(type, type.getClass().getSimpleName()); + } + return this; } } diff --git a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java index e2f2fc18d..aa3ab3c21 100644 --- a/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java +++ b/hibernate-types-60/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java @@ -12,14 +12,9 @@ import com.vladmihalcea.hibernate.util.ReflectionUtils; import org.hibernate.boot.model.TypeContributions; import org.hibernate.boot.model.TypeContributor; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.*; -import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.ServiceRegistry; -import org.hibernate.type.descriptor.java.JavaType; -import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry; -import org.hibernate.type.spi.TypeConfiguration; /** * The {@link HibernateTypesContributor} registers various types automatically. diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/H2DataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/H2DataSourceProvider.java index 95c249ead..f21f9b129 100644 --- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/H2DataSourceProvider.java +++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/H2DataSourceProvider.java @@ -2,6 +2,7 @@ import org.h2.jdbcx.JdbcConnectionPool; import org.h2.jdbcx.JdbcDataSource; +import org.hibernate.dialect.H2Dialect; import javax.sql.DataSource; import java.util.Properties; @@ -13,7 +14,7 @@ public class H2DataSourceProvider implements DataSourceProvider { @Override public String hibernateDialect() { - return "org.hibernate.dialect.H2Dialect"; + return H2Dialect.class.getName(); } @Override diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/HSQLDBDataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/HSQLDBDataSourceProvider.java index f7a4f9117..d7dc5e2a2 100644 --- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/HSQLDBDataSourceProvider.java +++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/HSQLDBDataSourceProvider.java @@ -1,5 +1,6 @@ package com.vladmihalcea.hibernate.util.providers; +import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbc.JDBCDataSource; import javax.sql.DataSource; @@ -12,7 +13,7 @@ public class HSQLDBDataSourceProvider implements DataSourceProvider { @Override public String hibernateDialect() { - return "org.hibernate.dialect.HSQLDialect"; + return HSQLDialect.class.getName(); } @Override diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java index 669fbb2c6..1cfff00fa 100644 --- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java +++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/MySQLDataSourceProvider.java @@ -1,6 +1,7 @@ package com.vladmihalcea.hibernate.util.providers; import com.mysql.cj.jdbc.MysqlDataSource; +import org.hibernate.dialect.MySQLDialect; import javax.sql.DataSource; import java.util.Properties; @@ -72,7 +73,7 @@ public void setUseLegacyDatetimeCode(boolean useLegacyDatetimeCode) { @Override public String hibernateDialect() { - return "org.hibernate.dialect.MySQL57Dialect"; + return MySQLDialect.class.getName(); } @Override diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/PostgreSQLDataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/PostgreSQLDataSourceProvider.java index 8dadc37b1..f5585009c 100644 --- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/PostgreSQLDataSourceProvider.java +++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/PostgreSQLDataSourceProvider.java @@ -1,6 +1,7 @@ package com.vladmihalcea.hibernate.util.providers; import org.hibernate.dialect.PostgreSQL95Dialect; +import org.hibernate.dialect.PostgreSQLDialect; import org.postgresql.ds.PGSimpleDataSource; import javax.sql.DataSource; @@ -13,7 +14,7 @@ public class PostgreSQLDataSourceProvider implements DataSourceProvider { @Override public String hibernateDialect() { - return PostgreSQL95Dialect.class.getName(); + return PostgreSQLDialect.class.getName(); } @Override diff --git a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java index 62a1ace79..58ff79c17 100644 --- a/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java +++ b/hibernate-types-60/src/test/java/com/vladmihalcea/hibernate/util/providers/SQLServerDataSourceProvider.java @@ -1,6 +1,7 @@ package com.vladmihalcea.hibernate.util.providers; import com.microsoft.sqlserver.jdbc.SQLServerDataSource; +import org.hibernate.dialect.SQLServerDialect; import javax.sql.DataSource; import java.util.Properties; @@ -11,7 +12,7 @@ public class SQLServerDataSourceProvider implements DataSourceProvider { @Override public String hibernateDialect() { - return "org.hibernate.dialect.SQLServer2012Dialect"; + return SQLServerDialect.class.getName(); } @Override