Merge c340a3c into eb12c08

jeffgbutler · web-flow · commit e37c44028a78 · 2023-06-09T21:42:17.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [11, 17, 20, 21-ea]
+        java: [11, 17, 20]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java b/src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java
@@ -54,7 +54,10 @@ public long count(Buildable<SelectModel> countStatement) {
     }
 
     public long count(SelectStatementProvider countStatement) {
-        return template.queryForObject(countStatement.getSelectStatement(), countStatement.getParameters(), Long.class);
+        Long answer = template.queryForObject(countStatement.getSelectStatement(),
+                countStatement.getParameters(), Long.class);
+
+        return answer == null ? 0L : answer;
     }
 
     public int delete(Buildable<DeleteModel> deleteStatement) {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,10 @@ public long count(Buildable<SelectModel> countStatement) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public long count(SelectStatementProvider countStatement) {`
`57`		`- return template.queryForObject(countStatement.getSelectStatement(), countStatement.getParameters(), Long.class);`
	`57`	`+ Long answer = template.queryForObject(countStatement.getSelectStatement(),`
	`58`	`+ countStatement.getParameters(), Long.class);`
	`59`	`+`
	`60`	`+ return answer == null ? 0L : answer;`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`public int delete(Buildable<DeleteModel> deleteStatement) {`