@@ -1245,29 +1245,27 @@ protected Expression rule(Or or) {
12451245 if (found .isEmpty () == false ) {
12461246 // combine Equals alongside the existing ORs
12471247 final ZoneId finalZoneId = zoneId ;
1248- found .forEach (
1249- (k , v ) -> {
1250- if (v .size () == 1 ) {
1251- ors .add (createEquals (k , v .iterator ().next (), finalZoneId ));
1252- } else {
1253- In in = createIn (k , new ArrayList <>(v ), finalZoneId );
1254- // IN has its own particularities when it comes to type resolution and not all implementations
1255- // double check the validity of an internally created IN (like the one created here). EQL is one where the IN
1256- // implementation is like this mechanism here has been specifically created for it
1257- if (shouldValidateIn ()) {
1258- Expression .TypeResolution resolution = in .validateInTypes ();
1259- if (resolution .unresolved ()) {
1260- // if the created In is not valid, fall back to regular Equals combined with ORs
1261- in .list ().forEach (inValue -> ors .add (createEquals (k , inValue , finalZoneId )));
1262- } else {
1263- ors .add (in );
1264- }
1248+ found .forEach ((k , v ) -> {
1249+ if (v .size () == 1 ) {
1250+ ors .add (createEquals (k , v .iterator ().next (), finalZoneId ));
1251+ } else {
1252+ In in = createIn (k , new ArrayList <>(v ), finalZoneId );
1253+ // IN has its own particularities when it comes to type resolution and not all implementations
1254+ // double check the validity of an internally created IN (like the one created here). EQL is one where the IN
1255+ // implementation is like this mechanism here has been specifically created for it
1256+ if (shouldValidateIn ()) {
1257+ Expression .TypeResolution resolution = in .validateInTypes ();
1258+ if (resolution .unresolved ()) {
1259+ // if the created In is not valid, fall back to regular Equals combined with ORs
1260+ in .list ().forEach (inValue -> ors .add (createEquals (k , inValue , finalZoneId )));
12651261 } else {
12661262 ors .add (in );
12671263 }
1264+ } else {
1265+ ors .add (in );
12681266 }
12691267 }
1270- );
1268+ } );
12711269
12721270 Expression combineOr = combineOr (ors );
12731271 // check the result semantically since the result might different in order
0 commit comments