fix crazy impl of DialectFeatureChecks.CurrentTimestampHasMicrosecondPrecision

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/InDbGenerationsWithAnnotationsTests.java

@@ -35,7 +35,8 @@
  */
 @DomainModel( annotatedClasses = InDbGenerationsWithAnnotationsTests.AuditedEntity.class )
 @SessionFactory
-@RequiresDialectFeature(feature = DialectFeatureChecks.CurrentTimestampHasMicrosecondPrecision.class, comment = "Without this, we might not see an update to the timestamp")
+@RequiresDialectFeature(feature = DialectFeatureChecks.CurrentTimestampHasMicrosecondPrecision.class,
+		comment = "Without this, we might not see an update to the timestamp")
 public class InDbGenerationsWithAnnotationsTests {
 	@Test
 	public void testGenerations(SessionFactoryScope scope) {
@@ -57,9 +58,7 @@ public void testGenerations(SessionFactoryScope scope) {
 			waitALittle();
 
 			// then changing
-			final AuditedEntity merged = scope.fromTransaction( session, (s) -> {
-				return (AuditedEntity) session.merge( saved );
-			} );
+			final AuditedEntity merged = scope.fromTransaction( session, s -> s.merge( saved ) );
 
 			assertThat( merged ).isNotNull();
 			assertThat( merged.createdOn ).isNotNull();
@@ -69,10 +68,8 @@ public void testGenerations(SessionFactoryScope scope) {
 			//We need to wait a little to make sure the timestamps produced are different
 			waitALittle();
 
-			// lastly, make sure we can load it..
-			final AuditedEntity loaded = scope.fromTransaction( session, (s) -> {
-				return session.get( AuditedEntity.class, 1 );
-			} );
+			// lastly, make sure we can load it
+			final AuditedEntity loaded = scope.fromTransaction( session, s -> s.get( AuditedEntity.class, 1 ) );
 
 			assertThat( loaded ).isNotNull();
 			assertThat( loaded.createdOn ).isEqualTo( merged.createdOn );

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java

@@ -458,7 +458,7 @@ public boolean apply(Dialect dialect) {
 
 	public static class CurrentTimestampHasMicrosecondPrecision implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return !dialect.currentTimestamp().contains( "6" );
+			return dialect.getDefaultTimestampPrecision() >= 6;
 		}
 	}