Merge branch 'master' of github.com:spring-projects/spring-data-couchbase into datacouch_1097_specific_message_for_string_queries_that_dont_project_cas_id

Author: mikereiche

src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java

@@ -97,13 +97,13 @@ public Flux<T> all() {
 							String id = "";
 							long cas = 0;
 							if (row.getString(TemplateUtils.SELECT_ID) == null) {
-								throw new CouchbaseException("query did not project " + TemplateUtils.SELECT_ID
+								throw new CouchbaseException("analytics query did not project " + TemplateUtils.SELECT_ID
 										+ ". Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_ID + " and "
 										+ TemplateUtils.SELECT_CAS + " : " + statement);
 							}
 							id = row.getString(TemplateUtils.SELECT_ID);
 							if (row.getLong(TemplateUtils.SELECT_CAS) == null) {
-								throw new CouchbaseException("query did not project " + TemplateUtils.SELECT_CAS
+								throw new CouchbaseException("analytics query did not project " + TemplateUtils.SELECT_CAS
 										+ ". Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_ID + " and "
 										+ TemplateUtils.SELECT_CAS + " : " + statement);
 							}

src/main/java/org/springframework/data/couchbase/core/query/N1QLExpression.java

@@ -262,13 +262,14 @@ public N1QLExpression returning(N1QLExpression right) {
 	public N1QLExpression keys(Iterable<? extends Serializable> ids) {
 		StringBuilder sb = new StringBuilder();
 		Iterator<?> it = ids.iterator();
-		// TODO: really? Lets do better.
+		sb.append("[");
 		while (it.hasNext()) {
-			sb.append(i(it.next().toString()));
+			sb.append(s(it.next().toString()));
 			if (it.hasNext()) {
 				sb.append(",");
 			}
 		}
+		sb.append("]");
 		return infix("USE KEYS", toString(), sb.toString());
 	}
 

src/main/resources/changelog.txt

@@ -1,6 +1,20 @@
 Spring Data Couchbase Changelog
 ===============================
 
+Changes in version 4.1.7 (2021-03-31)
+-------------------------------------
+* #1103 - revert 4.1.x to sdk 3.0.x.
+
+
+Changes in version 4.2.0-RC1 (2021-03-31)
+-----------------------------------------
+* #1105 - Readme lists artifacts with .RELEASE and .BUILD-SNAPSHOT suffixes.
+* #1096 - SimpleReactiveCouchbaseRepository.deleteAll() missing scan consistency.
+* #1073 - Support for ARRAY_CONTAINS.
+* #1069 - Enums can't be used as method parameters in Repository.
+* #1064 - N1QLExpression#keys is broken.
+
+
 Changes in version 4.2.0-M5 (2021-03-17)
 ----------------------------------------
 * #1092 - regression - changes to public API CouchbaseRepositoryQuery and ReactiveCouchbaseRepositoryQuery.
@@ -1367,6 +1381,8 @@ Release Notes - Spring Data Couchbase - Version 1.0 M1 - 2013-09-11
 
 
 
+
+
 
 
 

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Couchbase 4.2 M5 (2021.0.0)
+Spring Data Couchbase 4.2 RC1 (2021.0.0)
 Copyright (c) [2013-2019] Couchbase / Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -25,3 +25,4 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+

src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java

@@ -28,6 +28,8 @@
 
 import com.couchbase.client.java.json.JsonArray;
 
+import java.util.Arrays;
+
 /**
  * @author Mauro Monti
  */
@@ -251,6 +253,15 @@ void testFalse() {
 		assertEquals("not( (`name`) )", c.export());
 	}
 
+	@Test
+	void testKeys() {
+		N1QLExpression expression = N1QLExpression.x("");
+		assertEquals(" USE KEYS [\"a\",\"b\"]", expression.keys(Arrays.asList("a", "b")).toString());
+		assertEquals(" USE KEYS [\"a\"]", expression.keys(Arrays.asList("a")).toString());
+		assertEquals(" USE KEYS []", expression.keys(Arrays.asList()).toString());
+	}
+
+
 	@Test // https://github.com/spring-projects/spring-data-couchbase/issues/1066
 	void testCriteriaCorrectlyEscapedWhenUsingMetaOnLHS() {
 		final String bucketName = "sample-bucket";