From 72886bb256aa921ed99c878912bfde5e7ca8c64e Mon Sep 17 00:00:00 2001
From: Michael Reiche <48999328+mikereiche@users.noreply.github.com>
Date: Thu, 16 Jun 2022 10:41:51 -0700
Subject: [PATCH] Back-out the breaking part of 1441 from 4_4_x.

n1ql.bucket will continue to be (collection != null ? collection : bucket)
so that queries that referenced n1ql.bucket after being used on collections
will still work.

Closes #1462.
---
 .../couchbase/repository/query/StringBasedN1qlQueryParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
index d5f0765c..824bca02 100644
--- a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
+++ b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
@@ -205,7 +205,7 @@ public class StringBasedN1qlQueryParser {
 	 */
 	public N1qlSpelValues createN1qlSpelValues(String bucketName, String scope, String collection, Class domainClass,
 			String typeField, String typeValue, boolean isCount, String[] distinctFields, String[] fields) {
-		String b = bucketName;
+		String b = collection != null ? collection : bucketName;
 		String keyspace = collection != null ? collection : bucketName;
 		Assert.isTrue(!(distinctFields != null && fields != null),
 				"only one of project(fields) and distinct(distinctFields) can be specified");