From 540446ad5ab95229dc34ee9e773b6236b184a3d8 Mon Sep 17 00:00:00 2001 From: mikereiche Date: Wed, 9 Dec 2020 18:42:03 -0800 Subject: [PATCH] DATACOUCH-526 - N1qlJoinResolver not escaping bucketNames with special characters It escape the first bucket name, but not the second one. --- .../data/couchbase/core/convert/join/N1qlJoinResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java index fdecb7af7..35b0a5bf1 100644 --- a/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java +++ b/src/main/java/org/springframework/data/couchbase/core/convert/join/N1qlJoinResolver.java @@ -49,8 +49,8 @@ public static String buildQuery(CouchbaseTemplate template, N1qlJoinResolverPara } String useLKS = useLKSBuilder.length() > 0 ? "USE " + useLKSBuilder.toString() + " " : ""; - String from = "FROM `" + template.getBucketName() + "` lks " + useLKS + joinType + " " + template.getBucketName() - + " rks"; + String from = "FROM `" + template.getBucketName() + "` lks " + useLKS + joinType + " `" + template.getBucketName() + + "` rks"; String onLks = "lks." + template.getConverter().getTypeKey() + " = \"" + parameters.getEntityTypeInfo().getType().getName() + "\""; String onRks = "rks." + template.getConverter().getTypeKey() + " = \""