From d92df0dfc5f92688e943d8d4374cfc1be5329ed8 Mon Sep 17 00:00:00 2001 From: Michael Reiche <48999328+mikereiche@users.noreply.github.com> Date: Fri, 8 Oct 2021 09:50:00 -0700 Subject: [PATCH] Backport to project getFieldName() instead of getName() in queries. (#1248) Closes #1247. Co-authored-by: mikereiche --- .../repository/query/StringBasedN1qlQueryParser.java | 2 +- .../CouchbaseRepositoryQueryIntegrationTests.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java index bba2ef48..32d0812a 100644 --- a/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java +++ b/src/main/java/org/springframework/data/couchbase/repository/query/StringBasedN1qlQueryParser.java @@ -218,7 +218,7 @@ public class StringBasedN1qlQueryParser { if (path != null && path.length() != 0) { sb.append(path); } - sb.append(prop.getName()); + sb.append(prop.getFieldName()); sb.append('`'); // } } diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java index d0ccf83f..72ec1bbe 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java @@ -156,8 +156,11 @@ public class CouchbaseRepositoryQueryIntegrationTests extends ClusterAwareIntegr person = new Person(1, "first", "last"); person.setMiddlename("Nick"); // middlename is stored as nickname personRepository.save(person); - List persons2 = personRepository.findByMiddlename("Nick"); - assertEquals(1, persons2.size()); + Person person2 = personRepository.findById(person.getId().toString()).get(); + assertEquals(person.getMiddlename(), person2.getMiddlename()); + List persons3 = personRepository.findByMiddlename("Nick"); + assertEquals(1, persons3.size()); + assertEquals(person.getMiddlename(), persons3.get(0).getMiddlename()); } finally { personRepository.deleteById(person.getId().toString()); }