From aaf907399c816435134155adf8852ea5aa47a484 Mon Sep 17 00:00:00 2001 From: Michael Reiche <48999328+mikereiche@users.noreply.github.com> Date: Wed, 9 Dec 2020 23:50:26 -0800 Subject: [PATCH] DATACOUCH-526 - N1qlJoinResolver not escaping bucketNames with special characters (#291) It escape the first bucket name, but not the second one. Co-authored-by: mikereiche --- .../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 fdecb7af..35b0a5bf 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 class N1qlJoinResolver { } 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() + " = \""