Merge branch 'develop'

Author: FragonGamer

pom.xml

@@ -8,7 +8,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rdb-utils</artifactId>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<name>RdbUtils</name>
 	<packaging>jar</packaging>
 
@@ -32,12 +32,12 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>6.1.1.Final</version>
+			<version>6.1.2.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>6.1.1.Final</version>
+			<version>6.1.2.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>

src/test/java/info/unterrainer/commons/rdbutils/ManualTests.java

@@ -6,16 +6,15 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Query;
-import jakarta.persistence.TypedQuery;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import info.unterrainer.commons.rdbutils.exceptions.RdbUtilException;
 import info.unterrainer.commons.rdbutils.jpas.TestJpa;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -51,6 +50,21 @@ public void persistingAndReadingEntityWorks() {
 		assertThat(jpa.getEditedOn()).isEqualTo(testJpa.getEditedOn().truncatedTo(ChronoUnit.MICROS));
 	}
 
+	@Test
+	public void persistingAndUpdatingAndReadingEntityWorks() {
+		persistTestEntity(testJpa);
+
+		testJpa.setMessage("new message");
+		testJpa.setCreatedOn(LocalDateTime.now().plus(1, ChronoUnit.SECONDS));
+		testJpa.setEditedOn(LocalDateTime.now().plus(14, ChronoUnit.SECONDS));
+		updateTestEntity(testJpa);
+
+		TestJpa jpa = selectFirstTestEntity();
+		assertThat(jpa.getMessage()).isEqualTo(testJpa.getMessage());
+		assertEquals(jpa.getCreatedOn(), testJpa.getCreatedOn().truncatedTo(ChronoUnit.MICROS));
+		assertThat(jpa.getEditedOn()).isEqualTo(testJpa.getEditedOn().truncatedTo(ChronoUnit.MICROS));
+	}
+
 	private int deleteTestTable() {
 		return Transactions.withNewTransactionReturning(emf, em -> {
 			Query q = em.createQuery(String.format("DELETE FROM %s AS o", TestJpa.class.getSimpleName()));
@@ -66,6 +80,12 @@ private void persistTestEntity(final TestJpa jpa) {
 		});
 	}
 
+	private void updateTestEntity(final TestJpa jpa) {
+		Transactions.withNewTransaction(emf, em -> {
+			em.merge(jpa);
+		});
+	}
+
 	private TestJpa selectFirstTestEntity() {
 		return Transactions.withNewTransactionReturning(emf, em -> {
 			TypedQuery<TestJpa> q = em

src/test/resources/log4j.properties

@@ -16,4 +16,5 @@ log4j.logger.com.mchange.v2.log.MLog=WARN
 log4j.logger.org.jboss.logging=WARN
 log4j.logger.liquibase.servicelocator=WARN
 log4j.logger.liquibase.resource=WARN
-log4j.logger.com.mchange.v2=WARN
+log4j.logger.com.mchange.v2=WARN
+#log4j.logger.info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter=DEBUG