Change SqlQuery + Mapper + findOne() also to throw NonUniqueResultException

Author: rbygrave

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java

@@ -116,9 +116,14 @@ public <T> T findOne(RelationalQueryRequest request, RowMapper<T> mapper) {
     try {
       request.executeSql(binder, SpiQuery.Type.BEAN);
       T value = request.mapOne(mapper);
+      if (request.next()) {
+        throw new NonUniqueResultException("Got more than 1 result for findOne");
+      }
       request.logSummary();
       return value;
 
+    } catch (NonUniqueResultException e) {
+      throw e;
     } catch (Exception e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
 

ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java

@@ -388,6 +388,18 @@ void findOne_mapper() {
     assertThat(rob.name).isEqualTo("Rob");
   }
 
+  @Test
+  void findOne_mapper_when_notUnique() {
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer order by name desc";
+    assertThatThrownBy(() -> DB.sqlQuery(sql)
+      .mapTo(CUST_MAPPER)
+      .findOne())
+      .isInstanceOf(NonUniqueResultException.class)
+      .hasMessageContaining("Got more than 1 result for findOne");
+  }
+
   @Test
   void findList_mapper() {
     ResetBasicData.reset();