Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.sql.ast.spi.SqlAppender;
import org.hibernate.type.descriptor.DateTimeUtils;
import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.jdbc.JdbcType;
import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
Expand Down Expand Up @@ -224,7 +223,7 @@ public void appendEncodedString(SqlAppender sb, Date value) {
@Override
public Date fromEncodedString(CharSequence charSequence, int start, int end) {
try {
final TemporalAccessor accessor = DateTimeUtils.DATE_TIME.parse( subSequence( charSequence, start, end ) );
final TemporalAccessor accessor = ENCODED_FORMATTER.parse( subSequence( charSequence, start, end ) );
final Timestamp timestamp;
if ( accessor.isSupported( ChronoField.INSTANT_SECONDS ) ) {
timestamp = new Timestamp( accessor.getLong( ChronoField.INSTANT_SECONDS ) * 1000L );
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
/*
* SPDX-License-Identifier: LGPL-2.1-or-later
* Copyright Red Hat Inc. and Hibernate Authors
*/
package org.hibernate.orm.test.mapping.array;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.sql.ast.spi.SqlAppender;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.orm.junit.RequiresDialect;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.type.descriptor.java.JdbcTimestampJavaType;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;

import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import java.util.stream.Stream;

import static org.assertj.core.api.Assertions.assertThat;

@DomainModel(annotatedClasses = MySqlArrayOfTimestampsTest.Foo.class)
@SessionFactory
@JiraKey("HHH-18881")
class MySqlArrayOfTimestampsTest {

private static final LocalDateTime[] dataArray = {
// Unix epoch start if you're in the UK
LocalDateTime.of( 1970, Month.JANUARY, 1, 0, 0, 0, 0 ),
// pre-Y2K
LocalDateTime.of( 1999, Month.DECEMBER, 31, 23, 59, 59, 0 ),
// We survived! Why was anyone worried?
LocalDateTime.of( 2000, Month.JANUARY, 1, 0, 0, 0, 0 ),
// Silence will fall!
LocalDateTime.of( 2010, Month.JUNE, 26, 20, 4, 0, 0 ),
// 2024 summer time
LocalDateTime.of( 2024, 6, 20, 0, 0, 0 ),
// 2023 winer time
LocalDateTime.of( 2023, 12, 22, 0, 0, 0 )
};

private TimeZone currentDefault;

@BeforeAll
void setTimeZone() {
currentDefault = TimeZone.getDefault();
TimeZone.setDefault( TimeZone.getTimeZone( "Europe/Zagreb" ) );
}

@AfterAll
void restoreTimeZone() {
TimeZone.setDefault( currentDefault );
}

@Test
@Order(1)
@RequiresDialect(MySQLDialect.class)
public void testLocalDateTime(SessionFactoryScope scope) {

final Integer basicId = scope.fromTransaction( session -> {
Foo basic = new Foo();
basic.localDateTimeArray = dataArray;
basic.localDateTimeField = dataArray[0];
session.persist( basic );
return basic.id;
} );

scope.inTransaction( session -> {
Foo found = session.find( Foo.class, basicId );
assertThat( found.localDateTimeField ).isEqualTo( dataArray[0] );
assertThat( found.localDateTimeArray ).isEqualTo( dataArray );
} );
}


@Test
@Order(2)
@RequiresDialect(MySQLDialect.class)
public void testDate(SessionFactoryScope scope) {
Date[] dataArray = {Calendar.getInstance().getTime(), Calendar.getInstance().getTime()};

final Integer basicId = scope.fromTransaction( session -> {
Foo basic = new Foo();
basic.dateArray = dataArray;
basic.dateField = dataArray[0];
session.persist( basic );
return basic.id;
} );

scope.inTransaction( session -> {
Foo found = session.find( Foo.class, basicId );
assertThat( found.dateField.getTime() ).isEqualTo( dataArray[0].getTime() );
for ( int i = 0; i < dataArray.length; i++ ) {
assertThat( found.dateArray[i].getTime() ).isEqualTo( dataArray[i].getTime() );
}
} );
}

private static final LocalDateTime SUMMER = LocalDate.of( 2024, 6, 20 ).atStartOfDay();
private static final LocalDateTime WINTER = LocalDate.of( 2023, 12, 22 ).atStartOfDay();
private static final LocalDate EPOCH = LocalDate.of( 1970, Month.JANUARY, 1 );

private static final TimeZone[] TEST_TIME_ZONES = Stream.of(
"Africa/Monrovia",
"Europe/Zagreb",
"Asia/Singapore",
"Europe/Tallinn",
"Europe/Minsk",
"America/Anchorage"
).map( TimeZone::getTimeZone ).toArray( TimeZone[]::new );

@Test
void encodeThenDecodeLocalDateTime() {
for ( final TimeZone zone : TEST_TIME_ZONES ) {
final TimeZone currentTimeZone = TimeZone.getDefault();
TimeZone.setDefault( zone );
try {
for ( LocalDateTime dateTime : dataArray ) {
final MySqlAppender appender = new MySqlAppender();
final Timestamp expected = Timestamp.valueOf( dateTime );
JdbcTimestampJavaType.INSTANCE.appendEncodedString( appender, expected );
final Date actual = JdbcTimestampJavaType.INSTANCE.fromEncodedString( appender.stringBuilder, 0,
appender.stringBuilder.length() );
Assertions.assertEquals( expected, actual );
}
}
finally {
TimeZone.setDefault( currentTimeZone );
}
}
}

@Entity(name = "Foo")
public static class Foo {
@Id
@GeneratedValue
public Integer id;
public Date[] dateArray;
public LocalDateTime[] localDateTimeArray;
public Date dateField;
public LocalDateTime localDateTimeField;
}

private static class MySqlAppender implements SqlAppender {

private final StringBuilder stringBuilder = new StringBuilder();

@Override
public void appendSql(String fragment) {
stringBuilder.append( fragment );
}
}
}