Use scope and collection in transaction in findByQuery.count(). (#1868)

Closes #1862.
spring-projects · Jan 18, 2024 · b5dc1a2 · b5dc1a2
1 parent f1df93f
commit b5dc1a2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...ain/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java b/...ain/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
@@ -256,8 +256,9 @@ public Mono<Long> count() {
 							: rs.query(statement, opts);
 				} else {
 					TransactionQueryOptions opts = buildTransactionOptions(pArgs.getOptions());
-					return (AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(),
-							clientFactory.getCluster().environment().jsonSerializer())).query(statement, opts);
+					JsonSerializer jSer = clientFactory.getCluster().environment().jsonSerializer();
+					return AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(), jSer)
+							.query(OptionsBuilder.queryContext(pArgs.getScope(), pArgs.getCollection(), rs.bucketName()) == null ? null : rs, statement, opts);
 				}
 			});