Added testFlatCollectionArrayAnyOnJsonbArray

Author: suddendust

document-store/src/integrationTest/java/org/hypertrace/core/documentstore/DocStoreQueryV1Test.java

@@ -4018,6 +4018,34 @@ void testFlatCollectionUnnestJsonbArray(String dataStoreName) throws IOException
       // 2 from Lifebuoy (Orange, Blue)
       assertEquals(5, count, "Should find 5 color entries after unnesting JSONB arrays");
     }
+
+    @ParameterizedTest
+    @ArgumentsSource(PostgresProvider.class)
+    void testFlatCollectionArrayAnyOnJsonbArray(String dataStoreName) {
+      Datastore datastore = datastoreMap.get(dataStoreName);
+      Collection flatCollection =
+          datastore.getCollectionForType(FLAT_COLLECTION_NAME, DocumentType.FLAT);
+
+      // Test ArrayRelationalFilterExpression.ANY on JSONB array (props.colors)
+      // This uses jsonb_array_elements() internally
+      Query jsonbArrayQuery =
+          Query.builder()
+              .addSelection(IdentifierExpression.of("item"))
+              .setFilter(
+                  ArrayRelationalFilterExpression.builder()
+                      .operator(ArrayOperator.ANY)
+                      .filter(
+                          RelationalExpression.of(
+                              JsonIdentifierExpression.of("props", "colors"),
+                              EQ,
+                              ConstantExpression.of("Blue")))
+                      .build())
+              .build();
+
+      long count = flatCollection.count(jsonbArrayQuery);
+      // ids 1 and 5 have "Blue" in their colors array
+      assertEquals(2, count, "Should find 2 items with 'Blue' color (ids 1, 5)");
+    }
   }
 
   @Nested

document-store/src/main/java/org/hypertrace/core/documentstore/postgres/query/v1/vistors/PostgresFromTypeExpressionVisitor.java

@@ -87,7 +87,7 @@ public String visit(UnnestExpression unnestExpression) {
         String.format(
             UNWIND_EXP_ALIAS_FMT,
             nextIndex,
-            shouldQuoteColName(isFlatCollection && !isJsonbArray, pgColumnName));
+            getColName(isFlatCollection && !isJsonbArray, pgColumnName));
 
     String fmt =
         unnestExpression.isPreserveNullAndEmptyArrays()
@@ -152,9 +152,7 @@ private static String prepareTable0Query(PostgresQueryParser postgresQueryParser
   /*
   Returns the column name with double quotes if the collection is flat to prevent folding to lower-case by PG
    */
-  private String shouldQuoteColName(boolean isFlatCollection, String pgColumnName) {
-    return isFlatCollection
-        ? PostgresUtils.wrapFieldNamesWithDoubleQuotes(pgColumnName)
-        : pgColumnName;
+  private String getColName(boolean shouldQuote, String pgColumnName) {
+    return shouldQuote ? PostgresUtils.wrapFieldNamesWithDoubleQuotes(pgColumnName) : pgColumnName;
   }
 }