Skip to content

HHH-13266 Oracle, Mariadb and HANA test fixes #2815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 19, 2019
Merged

HHH-13266 Oracle, Mariadb and HANA test fixes #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60a8857
HHH-13266 Mark most databases as not supporting nanosecond-precision …
yrodiere Mar 14, 2019
77455a3
HHH-13266 Skip tests that involve timestamps before epoch with MySQL/…
yrodiere Mar 14, 2019
bc83255
HHH-13266 Skip some tests that apparently trigger bugs in HANA
yrodiere Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions hibernate-core/src/test/java/org/hibernate/test/type/AbstractJavaTimeTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.MariaDB10Dialect;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;

Expand Down Expand Up @@ -245,6 +248,19 @@ protected AbstractParametersBuilder() {
remappingDialectClasses.add( null ); // Always test without remapping
}

public S skippedForDialects(List<Class<?>> dialectClasses, Consumer<S> skippedIfDialectMatchesClasses) {
boolean skip = false;
for ( Class<?> dialectClass : dialectClasses ) {
if ( dialectClass.isInstance( dialect ) ) {
skip = true;
}
}
if ( !skip ) {
skippedIfDialectMatchesClasses.accept( thisAsS() );
}
return thisAsS();
}

@SafeVarargs
public final S alsoTestRemappingsWithH2(Class<? extends AbstractRemappingH2Dialect> ... dialectClasses) {
if ( dialect instanceof H2Dialect ) {
Expand All @@ -255,8 +271,8 @@ public final S alsoTestRemappingsWithH2(Class<? extends AbstractRemappingH2Diale
}

protected final boolean isNanosecondPrecisionSupported() {
// PostgreSQL apparently doesn't support nanosecond precision correctly
return !( dialect instanceof PostgreSQL81Dialect );
// Most databases apparently don't support nanosecond precision correctly
return dialect instanceof H2Dialect;
}

protected final S add(ZoneId defaultJvmTimeZone, Object ... subClassParameters) {
Expand Down
33 changes: 21 additions & 12 deletions hibernate-core/src/test/java/org/hibernate/test/type/InstantTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.Arrays;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;

import org.hibernate.dialect.MariaDBDialect;
import org.hibernate.dialect.MySQLDialect;

import org.junit.runners.Parameterized;

/**
Expand All @@ -45,18 +49,23 @@ public static List<Object[]> data() {
.add( 2017, 11, 6, 19, 19, 1, 0, ZONE_UTC_MINUS_8 )
.add( 2017, 11, 6, 19, 19, 1, 0, ZONE_PARIS )
.add( 2017, 11, 6, 19, 19, 1, 500, ZONE_PARIS )
.add( 1970, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_PARIS )
.add( 1900, 1, 2, 0, 9, 21, 0, ZONE_PARIS )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
.add( 1900, 1, 2, 0, 19, 32, 0, ZONE_AMSTERDAM )
// Affected by HHH-13266 (JDK-8061577)
.add( 1892, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1899, 12, 31, 23, 59, 59, 999_999_999, ZONE_PARIS )
.add( 1899, 12, 31, 23, 59, 59, 999_999_999, ZONE_AMSTERDAM )
.add( 1600, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
.skippedForDialects(
// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
b -> b
.add( 1970, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_PARIS )
.add( 1900, 1, 2, 0, 9, 21, 0, ZONE_PARIS )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
.add( 1900, 1, 2, 0, 19, 32, 0, ZONE_AMSTERDAM )
// Affected by HHH-13266 (JDK-8061577)
.add( 1892, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1899, 12, 31, 23, 59, 59, 999_999_999, ZONE_PARIS )
.add( 1899, 12, 31, 23, 59, 59, 999_999_999, ZONE_AMSTERDAM )
.add( 1600, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
)
.build();
}

Expand Down
31 changes: 21 additions & 10 deletions hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,27 @@
import java.sql.Types;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;

import org.hibernate.dialect.AbstractHANADialect;
import org.hibernate.dialect.MariaDBDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.type.descriptor.sql.TimestampTypeDescriptor;

import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.junit.runners.Parameterized;

/**
* Tests for storage of LocalDate properties.
*/
@TestForIssue(jiraKey = "HHH-10371")
@SkipForDialect(value = AbstractHANADialect.class, comment = "HANA systematically returns the wrong date when the JVM default timezone is not UTC")
public class LocalDateTest extends AbstractJavaTimeTypeTest<LocalDate, LocalDateTest.EntityWithLocalDate> {

private static class ParametersBuilder extends AbstractParametersBuilder<ParametersBuilder> {
Expand All @@ -44,16 +50,21 @@ public static List<Object[]> data() {
// Not affected by HHH-13266 (JDK-8061577)
.add( 2017, 11, 6, ZONE_UTC_MINUS_8 )
.add( 2017, 11, 6, ZONE_PARIS )
.add( 1970, 1, 1, ZONE_GMT )
.add( 1900, 1, 1, ZONE_GMT )
.add( 1900, 1, 1, ZONE_OSLO )
.add( 1900, 1, 2, ZONE_PARIS )
.add( 1900, 1, 2, ZONE_AMSTERDAM )
// Affected by HHH-13266 (JDK-8061577), but only when remapping dates as timestamps
.add( 1892, 1, 1, ZONE_OSLO )
.add( 1900, 1, 1, ZONE_PARIS )
.add( 1900, 1, 1, ZONE_AMSTERDAM )
.add( 1600, 1, 1, ZONE_AMSTERDAM )
.skippedForDialects(
// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
b -> b
.add( 1970, 1, 1, ZONE_GMT )
.add( 1900, 1, 1, ZONE_GMT )
.add( 1900, 1, 1, ZONE_OSLO )
.add( 1900, 1, 2, ZONE_PARIS )
.add( 1900, 1, 2, ZONE_AMSTERDAM )
// Affected by HHH-13266 (JDK-8061577), but only when remapping dates as timestamps
.add( 1892, 1, 1, ZONE_OSLO )
.add( 1900, 1, 1, ZONE_PARIS )
.add( 1900, 1, 1, ZONE_AMSTERDAM )
.add( 1600, 1, 1, ZONE_AMSTERDAM )
)
.build();
}

Expand Down
29 changes: 19 additions & 10 deletions hibernate-core/src/test/java/org/hibernate/test/type/LocalDateTimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;

import org.hibernate.dialect.MariaDBDialect;
import org.hibernate.dialect.MySQLDialect;

import org.junit.runners.Parameterized;

/**
Expand All @@ -42,16 +46,21 @@ public static List<Object[]> data() {
.add( 2017, 11, 6, 19, 19, 1, 0, ZONE_UTC_MINUS_8 )
.add( 2017, 11, 6, 19, 19, 1, 0, ZONE_PARIS )
.add( 2017, 11, 6, 19, 19, 1, 500, ZONE_PARIS )
.add( 1970, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1900, 1, 2, 0, 9, 21, 0, ZONE_PARIS )
.add( 1900, 1, 2, 0, 19, 32, 0, ZONE_AMSTERDAM )
// Affected by HHH-13266 (JDK-8061577)
.add( 1892, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1900, 1, 1, 0, 9, 20, 0, ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 31, 0, ZONE_AMSTERDAM )
.add( 1600, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
.skippedForDialects(
// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
b -> b
.add( 1970, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1900, 1, 2, 0, 9, 21, 0, ZONE_PARIS )
.add( 1900, 1, 2, 0, 19, 32, 0, ZONE_AMSTERDAM )
// Affected by HHH-13266 (JDK-8061577)
.add( 1892, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.add( 1900, 1, 1, 0, 9, 20, 0, ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 31, 0, ZONE_AMSTERDAM )
.add( 1600, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
)
.build();
}

Expand Down
38 changes: 28 additions & 10 deletions hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,20 @@
import java.sql.Types;
import java.time.LocalTime;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;

import org.hibernate.dialect.AbstractHANADialect;
import org.hibernate.dialect.MariaDBDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.type.descriptor.sql.TimestampTypeDescriptor;

import org.hibernate.testing.SkipForDialect;
import org.junit.Test;
import org.junit.runners.Parameterized;

/**
Expand Down Expand Up @@ -59,18 +65,23 @@ public static List<Object[]> data() {
.add( 19, 19, 1, 0, ZONE_UTC_MINUS_8 )
.add( 19, 19, 1, 0, ZONE_PARIS )
.add( 19, 19, 1, 500, ZONE_PARIS )
.add( 0, 0, 0, 0, ZONE_GMT )
.add( 0, 0, 0, 0, ZONE_OSLO )
.add( 0, 9, 20, 0, ZONE_PARIS )
.add( 0, 19, 31, 0, ZONE_AMSTERDAM )
.add( 0, 0, 0, 0, ZONE_AMSTERDAM )
.addPersistedWithoutHibernate( 1900, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.addPersistedWithoutHibernate( 1900, 1, 2, 0, 9, 21, 0, ZONE_PARIS )
.addPersistedWithoutHibernate( 1900, 1, 2, 0, 19, 32, 0, ZONE_AMSTERDAM )
.addPersistedWithoutHibernate( 1892, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.addPersistedWithoutHibernate( 1900, 1, 1, 0, 9, 20, 0, ZONE_PARIS )
.addPersistedWithoutHibernate( 1900, 1, 1, 0, 19, 31, 0, ZONE_AMSTERDAM )
.addPersistedWithoutHibernate( 1600, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
.skippedForDialects(
// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
b -> b
.add( 0, 0, 0, 0, ZONE_GMT )
.add( 0, 0, 0, 0, ZONE_OSLO )
.add( 0, 0, 0, 0, ZONE_AMSTERDAM )
.addPersistedWithoutHibernate( 1900, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.addPersistedWithoutHibernate( 1900, 1, 2, 0, 9, 21, 0, ZONE_PARIS )
.addPersistedWithoutHibernate( 1900, 1, 2, 0, 19, 32, 0, ZONE_AMSTERDAM )
.addPersistedWithoutHibernate( 1892, 1, 1, 0, 0, 0, 0, ZONE_OSLO )
.addPersistedWithoutHibernate( 1900, 1, 1, 0, 9, 20, 0, ZONE_PARIS )
.addPersistedWithoutHibernate( 1900, 1, 1, 0, 19, 31, 0, ZONE_AMSTERDAM )
.addPersistedWithoutHibernate( 1600, 1, 1, 0, 0, 0, 0, ZONE_AMSTERDAM )
)
.build();
}

Expand Down Expand Up @@ -159,6 +170,13 @@ protected Object getActualJdbcValue(ResultSet resultSet, int columnIndex) throws
return resultSet.getTimestamp( columnIndex );
}

@Override
@Test
@SkipForDialect(value = AbstractHANADialect.class, comment = "HANA seems to return a java.sql.Timestamp instead of a java.sql.Time")
public void writeThenNativeRead() {
super.writeThenNativeRead();
}

@Entity(name = ENTITY_NAME)
static final class EntityWithLocalTime {
@Id
Expand Down
40 changes: 24 additions & 16 deletions hibernate-core/src/test/java/org/hibernate/test/type/OffsetDateTimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;
import javax.persistence.Basic;
Expand All @@ -22,6 +23,8 @@
import javax.persistence.Id;

import org.hibernate.Query;
import org.hibernate.dialect.MariaDBDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.type.OffsetDateTimeType;

import org.hibernate.testing.TestForIssue;
Expand Down Expand Up @@ -68,22 +71,27 @@ public static List<Object[]> data() {
.add( 2017, 11, 6, 19, 19, 1, 0, "-02:00", ZONE_PARIS )
.add( 2017, 11, 6, 19, 19, 1, 0, "-06:00", ZONE_PARIS )
.add( 2017, 11, 6, 19, 19, 1, 0, "-08:00", ZONE_PARIS )
.add( 1970, 1, 1, 0, 0, 0, 0, "+01:00", ZONE_GMT )
.add( 1970, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_GMT )
.add( 1970, 1, 1, 0, 0, 0, 0, "-01:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "+01:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "-01:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_OSLO )
.add( 1900, 1, 1, 0, 9, 21, 0, "+00:09:21", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 32, 0, "+00:19:32", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 32, 0, "+00:19:32", ZONE_AMSTERDAM )
// Affected by HHH-13266
.add( 1892, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_OSLO )
.add( 1900, 1, 1, 0, 9, 20, 0, "+00:09:21", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 31, 0, "+00:19:32", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 31, 0, "+00:19:32", ZONE_AMSTERDAM )
.add( 1600, 1, 1, 0, 0, 0, 0, "+00:19:32", ZONE_AMSTERDAM )
.skippedForDialects(
// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
b -> b
.add( 1970, 1, 1, 0, 0, 0, 0, "+01:00", ZONE_GMT )
.add( 1970, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_GMT )
.add( 1970, 1, 1, 0, 0, 0, 0, "-01:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "+01:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "-01:00", ZONE_GMT )
.add( 1900, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_OSLO )
.add( 1900, 1, 1, 0, 9, 21, 0, "+00:09:21", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 32, 0, "+00:19:32", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 32, 0, "+00:19:32", ZONE_AMSTERDAM )
// Affected by HHH-13266
.add( 1892, 1, 1, 0, 0, 0, 0, "+00:00", ZONE_OSLO )
.add( 1900, 1, 1, 0, 9, 20, 0, "+00:09:21", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 31, 0, "+00:19:32", ZONE_PARIS )
.add( 1900, 1, 1, 0, 19, 31, 0, "+00:19:32", ZONE_AMSTERDAM )
.add( 1600, 1, 1, 0, 0, 0, 0, "+00:19:32", ZONE_AMSTERDAM )
)
.build();
}

Expand Down
Loading