From 55a2cb12bb17712b634fae536da5d8484943481a Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 12 May 2020 21:11:28 +1200 Subject: [PATCH] #2007 - Encrypted fields unable to be mapped when using DtoQuery --- src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java | 2 +- .../java/io/ebeaninternal/server/core/DtoQueryRequestTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index 82bb375f4..c217f7a9f 100644 --- a/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -125,7 +125,7 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { } static String parseColumn(String columnLabel) { - if (columnLabel.startsWith("_e_")) { + if (columnLabel.startsWith("_e_") || columnLabel.startsWith("_E_")) { // encrypted column alias in the form _e__ final int pos = columnLabel.indexOf("_", 3); if (pos > -1) { diff --git a/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java index 1fd1df110..f8bdd66bd 100644 --- a/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java +++ b/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java @@ -12,7 +12,9 @@ public class DtoQueryRequestTest { assertEquals("foo", DtoQueryRequest.parseColumn("foo")); assertEquals("bar", DtoQueryRequest.parseColumn("_e_t0_bar")); + assertEquals("BAR", DtoQueryRequest.parseColumn("_E_T0_BAR")); assertEquals("baz", DtoQueryRequest.parseColumn("_e_t42_baz")); + assertEquals("BAZ", DtoQueryRequest.parseColumn("_E_T42_BAZ")); assertEquals("e_t42_nope", DtoQueryRequest.parseColumn("e_t42_nope")); assertEquals("_f_t42_nope", DtoQueryRequest.parseColumn("_f_t42_nope"));