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.
This commit is contained in:
Michael Reiche
2022-06-16 10:41:51 -07:00
parent f052aa4826
commit 72886bb256

View File

@@ -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");