Issue #2755 - Date editor: prevent hidden time-portion in @DateOnly properties

platform-annotation-processors-test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fielden</groupId>
         <artifactId>platform-parent</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-annotation-processors-test</artifactId>

platform-annotation-processors/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fielden</groupId>
         <artifactId>platform-parent</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-annotation-processors</artifactId>

platform-annotations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>fielden</groupId>
         <artifactId>platform-parent</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-annotations</artifactId>

platform-benchmark/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>fielden</groupId>
         <artifactId>platform-parent</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.5-SNAPSHOT</version>
     </parent>
 
     <name>Trident Genesis Platform Microbenckmarks</name>

platform-benchmark/src/main/java/ua/com/fielden/companion/BenchmarkIocModule.java

@@ -19,9 +19,9 @@
 import ua.com.fielden.platform.serialisation.api.impl.IdOnlyProxiedEntityTypeCacheForTests;
 import ua.com.fielden.platform.web.annotations.AppUri;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;
 
@@ -59,7 +59,7 @@ protected void configure() {
     @Provides
     @Singleton
     @SessionCache Cache<String, UserSession> provideSessionCache() {
-        return CacheBuilder.newBuilder().expireAfterWrite(2, TimeUnit.MINUTES).build();
+        return CacheBuilder.newBuilder().expireAfterWrite(Duration.ofMinutes(2)).build();
     }
 
 }

platform-benchmark/src/main/java/ua/com/fielden/eql/BenchmarkIocModule.java

@@ -19,9 +19,9 @@
 import ua.com.fielden.platform.serialisation.api.impl.IdOnlyProxiedEntityTypeCacheForTests;
 import ua.com.fielden.platform.web.annotations.AppUri;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;
 
@@ -59,7 +59,7 @@ protected void configure() {
     @Provides
     @Singleton
     @SessionCache Cache<String, UserSession> provideSessionCache() {
-        return CacheBuilder.newBuilder().expireAfterWrite(2, TimeUnit.MINUTES).build();
+        return CacheBuilder.newBuilder().expireAfterWrite(Duration.ofMinutes(2)).build();
     }
 
 }

platform-dao/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>fielden</groupId>
         <artifactId>platform-parent</artifactId>
-        <version>2.4.2-SNAPSHOT</version>
+        <version>2.4.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-dao</artifactId>

platform-dao/src/main/java/ua/com/fielden/platform/eql/dbschema/HibernateToJdbcSqlTypeCorrespondence.java

@@ -10,8 +10,6 @@
 import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import static org.apache.commons.lang3.StringUtils.substringBefore;
 import static ua.com.fielden.platform.utils.Pair.pair;
@@ -40,11 +38,8 @@ public final class HibernateToJdbcSqlTypeCorrespondence {
      */
     // funnily enough Hibernate itself performs such conversion in certain Dialect implementations
     public static String genericSqlTypeName(final int sqlType, final Dialect dialect) {
-        final var map = GENERIC_TYPE_NAMES.computeIfAbsent(dialect, $ -> new ConcurrentHashMap<>());
-        return map.computeIfAbsent(sqlType, $ -> substringBefore(dialect.getTypeName(sqlType), '('));
+        return substringBefore(dialect.getTypeName(sqlType), '(');
     }
-    // where
-    private static final Map<Dialect, Map<Integer, String>> GENERIC_TYPE_NAMES = new ConcurrentHashMap<>(1); // expect at most 1 dialect
 
     /**
      * Infers the name of a Hibernate type to use in a {@code CAST} SQL expression.

platform-dao/src/main/java/ua/com/fielden/platform/sample/domain/TgEntityWithTimeZoneDatesDao.java

@@ -22,7 +22,14 @@ public TgEntityWithTimeZoneDatesDao(final IFilter filter) {
 
     @Override
     protected IFetchProvider<TgEntityWithTimeZoneDates> createFetchProvider() {
-        return super.createFetchProvider().with("key", "dateProp", "datePropUtc", "datePropDependent");
+        return super.createFetchProvider().with(
+            "key",
+            "dateProp",
+            "datePropUtc",
+            "datePropDependent",
+            "dateOnlyProp",
+            "dateOnlyPropUtc"
+        );
     }
 
 }

platform-dao/src/test/java/ua/com/fielden/platform/dao/dynamic/DynamicQueryBuilderSqlTest.java

@@ -15,6 +15,8 @@
 import ua.com.fielden.platform.entity.query.DbVersion;
 import ua.com.fielden.platform.entity.query.fluent.EntityQueryProgressiveInterfaces.ICompleted;
 import ua.com.fielden.platform.entity.query.fluent.EntityQueryProgressiveInterfaces.IJoin;
+import ua.com.fielden.platform.entity.query.model.ConditionModel;
+import ua.com.fielden.platform.entity.query.model.EntityResultQueryModel;
 import ua.com.fielden.platform.entity_centre.mnemonics.DateMnemonicUtils;
 import ua.com.fielden.platform.entity_centre.mnemonics.DateRangePrefixEnum;
 import ua.com.fielden.platform.entity_centre.mnemonics.DateRangeSelectorEnum;
@@ -23,11 +25,12 @@
 import ua.com.fielden.platform.eql.dbschema.HibernateMappingsGenerator;
 import ua.com.fielden.platform.eql.dbschema.PropertyInlinerImpl;
 import ua.com.fielden.platform.eql.meta.EqlTables;
+import ua.com.fielden.platform.error.Result;
 import ua.com.fielden.platform.meta.DomainMetadataBuilder;
 import ua.com.fielden.platform.meta.DomainMetadataUtils;
 import ua.com.fielden.platform.persistence.types.PlatformHibernateTypeMappings;
 import ua.com.fielden.platform.reflection.PropertyTypeDeterminator;
-import ua.com.fielden.platform.sample.domain.TgBogie;
+import ua.com.fielden.platform.sample.domain.*;
 import ua.com.fielden.platform.security.ISecurityToken;
 import ua.com.fielden.platform.security.interception.MasterEntity_CanRead_unauthorisedProp_Token;
 import ua.com.fielden.platform.security.user.SecurityRoleAssociation;
@@ -43,7 +46,7 @@
 import static java.util.Optional.empty;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.Assert.assertEquals;
-import static ua.com.fielden.platform.entity.AbstractEntity.DESC;
+import static org.junit.Assert.assertThrows;
 import static ua.com.fielden.platform.entity.AbstractEntity.KEY;
 import static ua.com.fielden.platform.entity.query.IDbVersionProvider.constantDbVersion;
 import static ua.com.fielden.platform.entity.query.fluent.EntityQueryUtils.cond;
@@ -576,60 +579,90 @@ public void query_composition_for_property_of_type_string_with_and_without_wildc
         assertEquals("Incorrect query model has been built.", expected.model(), actual.model());
     }
 
+
     @Test
     public void query_composition_for_properties_of_entity_type_with_wildcard_selection_crit_value_uses_iLike_operator() {
-        final var property = queryProperties.get("entityProp");
+        final String propertyName = "entityProp";
+
+        set_up();
+        final QueryProperty property = queryProperties.get(propertyName);
         final var values = List.of("some val 1*", "some val 2*");
         property.setValue(values);
 
-        final var expected = iJoin.where()
-                .condition(cond()
-                           .condition(cond().prop(createConditionProperty("entityProp")).isNotNull()
-                                      .and().condition(cond().prop(createConditionProperty("entityProp") + "." + KEY).iLike().anyOfValues(prepCritValuesForEntityTypedProp(values)).model())
-                                      .model())
-                           .model());
-        final var actual = createQuery(masterKlass, new ArrayList<>(queryProperties.values()), dates);
+        final String cbn = property.getConditionBuildingName();
+        final var cbnNoKey = getPropertyNameWithoutKeyPart(cbn);
+
+        final ICompleted<? extends AbstractEntity<?>> expected = //
+        /**/iJoin.where().condition(cond() //
+        /*  */.condition(cond().prop(cbnNoKey).isNotNull().and() //
+        /*    */.condition(cond().prop(cbnNoKey).in().model(select(SlaveEntity.class).where().prop(KEY).iLike().anyOfValues(prepCritValuesForEntityTypedProp(values)).model()).model())
+        /*  */.model()) //
+        /**/.model()); //
+        final ICompleted<? extends AbstractEntity<?>> actual = createQuery(masterKlass, new ArrayList<>(queryProperties.values()), dates);
 
         assertEquals("Incorrect query model has been built.", expected.model(), actual.model());
     }
 
     @Test
-    public void query_composition_for_properties_of_entity_type_without_wildcard_selection_crit_value() {
-        final var property = queryProperties.get("entityProp");
-        property.setValue(List.of("some val 1", "some val 2"));
-
-        final var expected = iJoin.where()
-                .condition(cond()
-                           .condition(cond().prop(createConditionProperty("entityProp")).isNotNull()
-                                            .and().condition(cond().prop(createConditionProperty("entityProp") + "." + KEY).in().values("some val 1", "some val 2").model())
-                                            .model())
-                                   .model());
-        final var actual = createQuery(masterKlass, new ArrayList<>(queryProperties.values()), dates);
+    public void query_composition_for_properties_of_entity_type_without_wildcard_selection_crit_value_uses_in_operator_with_subselect() {
+        final String propertyName = "entityProp";
+
+        set_up();
+        final QueryProperty property = queryProperties.get(propertyName);
+        final String[] critValues = new String[] {"some val 1", "some val 2"};
+        property.setValue(Arrays.asList(critValues));
+
+
+        final String cbn = property.getConditionBuildingName();
+        final String cbnNoKey = cbn.substring(0, cbn.length() - 4); // cut off ".key" from the name
+
+        final ICompleted<? extends AbstractEntity<?>> expected = //
+        /**/iJoin.where().condition(cond() //
+        /*  */.condition(cond().prop(getPropertyNameWithoutKeyPart(cbn)).isNotNull().and() //
+        /*  */.condition(cond().prop(cbnNoKey).in().model(select(SlaveEntity.class).where().prop("key").in().values("some val 1", "some val 2").model()).model()) //
+        /*  */.model()) //
+        /**/.model()); //
+        final ICompleted<? extends AbstractEntity<?>> actual = createQuery(masterKlass, new ArrayList<>(queryProperties.values()), dates);
 
         assertEquals("Incorrect query model has been built.", expected.model(), actual.model());
     }
 
     @Test
-    public void query_composition_for_properties_of_entity_type_with_and_without_wildcard_selection_crit_value() {
-        final var property = queryProperties.get("entityProp");
-        property.setValue(List.of("some val 1", "some val 2*", "some val 3*", "some val 4"));
-
-        final var expected = iJoin.where()
-                .condition(cond()
-                           .condition(cond()
-                                      .prop(createConditionProperty("entityProp")).isNotNull()
-                                      .and().condition(cond().prop(path(createConditionProperty("entityProp"), KEY)).in().values("some val 1", "some val 4")
-                                                             .or()
-                                                             .prop(path(createConditionProperty("entityProp"), KEY)).iLike().anyOfValues(prepCritValuesForEntityTypedProp(List.of("some val 2*", "some val 3*")))
-                                                             .model())
-                                      .model())
-                           .model());
-
-        final var actual = createQuery(masterKlass, new ArrayList<>(queryProperties.values()), dates);
+    public void query_composition_for_properties_of_entity_type_with_and_without_wildcard_selection_crit_value_uses_combination_of_in_operator_with_subselect_and_iLike_operator() {
+        final String propertyName = "entityProp";
+
+        set_up();
+        final QueryProperty property = queryProperties.get(propertyName);
+        final String[] critValues = new String[] {"some val 1", "some val 2*", "some val 3*", "some val 4",};
+        property.setValue(Arrays.asList(critValues));
+
+        final String[] critValuesWithWildcard = new String[] {"some val 2*", "some val 3*"};
+
+        final String cbn = property.getConditionBuildingName();
+        final String cbnNoKey = cbn.substring(0, cbn.length() - 4); // cut off ".key" from the name
+
+
+        final EntityResultQueryModel<SlaveEntity> subSelect = select(SlaveEntity.class).where().prop("key").in().values("some val 1", "some val 4").model();
+        final ConditionModel whereCondition = cond()
+                .condition(
+                        cond().prop(getPropertyNameWithoutKeyPart(cbn)).isNotNull()
+                            .and()
+                            .condition(
+                                cond().prop(cbnNoKey).in().model(subSelect)
+                                .or().prop(cbnNoKey).in().model(select(SlaveEntity.class).where().prop(KEY).iLike().anyOfValues(prepCritValuesForEntityTypedProp(Arrays.asList(critValuesWithWildcard))).model())
+                                .model())
+                        .model())
+                .model();
+
+        final ICompleted<? extends AbstractEntity<?>> expected = //
+        /**/iJoin.where().condition(whereCondition);
+
+        final ICompleted<? extends AbstractEntity<?>> actual = createQuery(masterKlass, new ArrayList<>(queryProperties.values()), dates);
 
         assertEquals("Incorrect query model has been built.", expected.model(), actual.model());
     }
 
+
     //---------------------------------------------------------------------------------------//
     //------------------------------ 2. Property level (Negation / Null) --------------------//
     //---------------------------------------------------------------------------------------//
@@ -1364,35 +1397,35 @@ public void conditions_for_union_members_are_combined_with_logical_AND() {
         property.setValue(3);
         property.setValue2(7);
 
-        final var expected = select(select(TgBogie.class).model().setShouldMaterialiseCalcPropsAsColumnsInSqlQuery(true)).as(alias).where()
-                .condition(cond()
-                           .condition(cond().prop(alias).isNotNull().and()
-                                      .condition(cond().prop(path(alias, KEY)).iLike().anyOfValues("some val 1%", "some val 2%").model())
-                                      .model()).and()
-                           .condition(cond().prop(path(alias, DESC)).isNotNull().and()
-                                      .condition(cond().prop(path(alias, DESC)).iLike().anyOfValues("%Some string value%").model())
-                                      .model()).and()
-                           .condition(cond().prop(path(alias, "location")).isNotNull().and()
-                                      .condition(cond().prop(path(alias, "location.key")).iLike().anyOfValues("some val 1%", "some val 2%").model())
-                                      .model()).and()
-                           .condition(cond().prop(path(alias, "location.workshop")).isNotNull().and()
-                                      .condition(cond().prop(path(alias, "location.workshop.key")).iLike().anyOfValues("some val 1%", "some val 2%").model())
-                                      .model()).and()
-                           .condition(cond().prop(path(alias, "location.workshop.desc")).isNotNull().and()
-                                      .condition(cond().prop(path(alias, "location.workshop.desc")).iLike().anyOfValues("%Some string value%").model())
-                                      .model())
-                           .and()
-                           .condition(cond().prop(path(alias, "location.wagonSlot")).isNotNull().and()
-                                      .condition(cond().prop(path(alias, "location.wagonSlot.key")).iLike().anyOfValues("some val 1%", "some val 2%").model())
-                                      .model()).and()
-                           .condition(cond().prop(path(alias, "location.wagonSlot.wagon")).isNotNull().and()
-                                      .condition(cond().prop(path(alias, "location.wagonSlot.wagon.key")).iLike().anyOfValues("some val 1%", "some val 2%").model())
-                                      .model()).and()
-                           .condition(cond().prop(path(alias, "location.wagonSlot.position")).isNotNull().and()
-                                      .condition(cond().prop(path(alias, "location.wagonSlot.position")).ge().iVal(3).and().prop(path(alias, "location.wagonSlot.position")).le().iVal(7).model())
-                                      .model())
-                .model());
-        final var actual = createQuery(TgBogie.class, new ArrayList<>(unionProps.values()), dates);
+        final ICompleted<? extends AbstractEntity<?>> expected =
+        /**/select(select(TgBogie.class).model().setShouldMaterialiseCalcPropsAsColumnsInSqlQuery(true)).as(alias).where().condition(cond() //
+        /*  */.condition(cond().prop(alias).isNotNull().and() //
+           /*    */.condition(cond().prop(alias).in().model(select(TgBogie.class).where().prop(KEY).iLike().anyOfValues("some val 1%", "some val 2%").model()).model())//
+        /*  */.model()).and()//
+        /*  */.condition(cond().prop(alias + ".desc").isNotNull().and() //
+        /*    */.condition(cond().prop(alias + ".desc").iLike().anyOfValues("%Some string value%").model()) //
+        /*  */.model()).and()//
+        /*  */.condition(cond().prop(alias + ".location").isNotNull().and() //
+        /*    */.condition(cond().prop(alias + ".location").in().model(select(TgBogieLocation.class).where().prop(KEY).iLike().anyOfValues("some val 1%", "some val 2%").model()).model())//
+        /*  */.model()).and()//
+        /*    */.condition(cond().prop(alias + ".location.workshop").isNotNull().and()//
+        /*	    */.condition(cond().prop(alias + ".location.workshop").in().model(select(TgWorkshop.class).where().prop(KEY).iLike().anyOfValues("some val 1%", "some val 2%").model()).model())//
+        /*	  */.model()).and()//
+        /*	  */.condition(cond().prop(alias + ".location.workshop.desc").isNotNull().and()//
+        /*	    */.condition(cond().prop(alias + ".location.workshop.desc").iLike().anyOfValues("%Some string value%").model())
+                /*	  */.model())//
+        /*    */.and() // this used to be OR
+        /*	  */.condition(cond().prop(alias + ".location.wagonSlot").isNotNull().and()//
+        /*	    */.condition(cond().prop(alias + ".location.wagonSlot").in().model(select(TgWagonSlot.class).where().prop(KEY).iLike().anyOfValues("some val 1%", "some val 2%").model()).model())//
+        /*	  */.model()).and()//
+        /*	  */.condition(cond().prop(alias + ".location.wagonSlot.wagon").isNotNull().and()//
+        /*	    */.condition(cond().prop(alias + ".location.wagonSlot.wagon").in().model(select(TgWagon.class).where().prop(KEY).iLike().anyOfValues("some val 1%", "some val 2%").model()).model())//
+        /*	  */.model()).and()//
+        /*	  */.condition(cond().prop(alias + ".location.wagonSlot.position").isNotNull().and()//
+        /*	    */.condition(cond().prop(alias + ".location.wagonSlot.position").ge().iVal(3).and().prop(alias + ".location.wagonSlot.position").le().iVal(7).model())//
+        /*	  */.model())//
+        /**/.model()); //
+        final ICompleted<? extends AbstractEntity<?>> actual = createQuery(TgBogie.class, new ArrayList<>(unionProps.values()), dates);
         assertEquals("Incorrect query model for union entities has been built.", expected.model(), actual.model());
     }
 
@@ -1438,10 +1471,4 @@ private void removeAccessTo(final Class<? extends ISecurityToken> token) {
         ));
     }
 
-    /// Joins property paths.
-    ///
-    private static String path(final CharSequence... xs) {
-        return String.join(".", xs);
-    }
-
 }