Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with #n1ql.bucket evaluated as collection name in string based queries. (#1804)

Browse Source 
Closes #1799
This commit is contained in:
Tigran Babloyan
2023-08-10 21:24:05 +04:00
committed by mikereiche
parent 2a4aa5ed7b
commit 9b1cd645ac
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java
View File

@@ -62,6 +62,7 @@ import com.couchbase.client.java.json.JsonValue;
/**
* @author Subhashni Balakrishnan
* @author Michael Reiche
* @author Tigran Babloyan
*/
public class StringBasedN1qlQueryParser {
public static final String SPEL_PREFIX = "n1ql";
@@ -166,7 +167,7 @@ public class StringBasedN1qlQueryParser {
this.queryMethod = queryMethod;
this.couchbaseConverter = couchbaseConverter;
this.statementContext = queryMethod == null ? null
: createN1qlSpelValues(collection != null ? collection : bucketName, scope, collection,
: createN1qlSpelValues(bucketName, scope, collection,
queryMethod.getEntityInformation().getJavaType(), typeField, typeValue, queryMethod.isCountQuery(), null, null);
this.parsedExpression = getExpression(statement, queryMethod, accessor, spelExpressionParser,
evaluationContextProvider);

2
src/test/java/org/springframework/data/couchbase/repository/query/StringN1qlQueryCreatorTests.java
View File

@@ -208,7 +208,7 @@ class StringN1qlQueryCreatorTests {
assertEquals("SELECT `_class`, `jsonNode`, `jsonObject`, `jsonArray`, META(`myCollection`).`cas`"
+ " AS __cas, `createdBy`, `createdDate`, `lastModifiedBy`, `lastModifiedDate`, META(`myCollection`).`id`"
+ " AS __id, `firstname`, `lastname`, `subtype` FROM `myCollection`|`_class` = \"abstractuser\"|`myCollection`|`myScope`|`myCollection`",
+ " AS __id, `firstname`, `lastname`, `subtype` FROM `myCollection`|`_class` = \"abstractuser\"|`some_bucket`|`myScope`|`myCollection`",
query.toN1qlSelectString(converter, bucketName(), "myScope", "myCollection", User.class, null, false, null,
null));
}