Skip to content

Bug 47910.count query text block #47911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blackbaud-JasonBodnar wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Bug 47910.count query text block #47911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eaf72e2
RED: isCountQuery() should return true for queries in text blocks
Blackbaud-JasonBodnar Feb 5, 2026
fb3a78d
GREEN: isCountQuery() should return true for queries in text blocks
Blackbaud-JasonBodnar Feb 5, 2026
7bf24cf
RED: isSumQuery() should return true for sum query in java text block
Blackbaud-JasonBodnar Feb 5, 2026
2a5ce01
GREEN: isSumQuery() should return true for sum query in java text block
Blackbaud-JasonBodnar Feb 5, 2026
8a71b18
Merge branch 'main' into bug_47910.count_query_text_block
Blackbaud-JasonBodnar Feb 5, 2026
a310286
Merge branch 'main' into bug_47910.count_query_text_block
Blackbaud-JasonBodnar Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

#### Bugs Fixed

* Fixing bug where count query defined in a Java text block in `@Query` causes a class cast exception - See [Bug #47910](https://github.com/Azure/azure-sdk-for-java/issues/47910).
* Also fixed the same bug for sum query.

#### Other Changes

### 7.0.0 (2026-02-03)
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
* Cosmos query class to handle the annotated queries. This overrides the execution and runs the query directly
*/
public class StringBasedCosmosQuery extends AbstractCosmosQuery {
private static final Pattern COUNT_QUERY_PATTERN = Pattern.compile("^\\s*select\\s+value\\s+count.*", Pattern.CASE_INSENSITIVE);
private static final Pattern SUM_QUERY_PATTERN = Pattern.compile("^\\s*select\\s+value\\s+sum.*", Pattern.CASE_INSENSITIVE);
private static final Pattern COUNT_QUERY_PATTERN = Pattern.compile("^\\s*select\\s+value\\s+count.*", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
private static final Pattern SUM_QUERY_PATTERN = Pattern.compile("^\\s*select\\s+value\\s+sum.*", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);

private final String query;

Expand Down
24 changes: 24 additions & 0 deletions .../java/com/azure/spring/data/cosmos/repository/support/StringBasedCosmosQueryUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,28 @@ public void testStripExtraWhitespaceFromString() throws NoSuchMethodException, I
String result3 = (String) method.invoke(sbcq, args3);
assertThat(result3).isEqualTo(expectedResult);
}

@Test
public void testTextBlockCountQuery() {
String countQuery = """
SELECT VALUE COUNT(1)
FROM a
WHERE a.city = @city
AND a.state = @state
""";
boolean result = StringBasedCosmosQuery.isCountQuery(countQuery, long.class);
assertThat(result).isTrue();
}

@Test
public void testTextBlockSumQuery() {
String sumQuery = """
SELECT VALUE SUM(a.population)
FROM a
WHERE a.city = @city
AND a.state = @state
""";
boolean result = StringBasedCosmosQuery.isSumQuery(sumQuery, long.class);
assertThat(result).isTrue();
}
}
Loading