#611 - findRowCount ignores @SoftDelete, does not add predicate

src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java

@@ -234,6 +234,10 @@ public class CQueryBuilder {
     predicates.prepare(true);
 
     SqlTree sqlTree = createSqlTree(request, predicates, getHistorySupport(query), getDraftSupport(query));
+    if (SpiQuery.TemporalMode.CURRENT == query.getTemporalMode()) {
+      sqlTree.addSoftDeletePredicate(query);
+    }
+
     SqlLimitResponse s = buildSql(sqlSelect, request, predicates, sqlTree);
     String sql = s.getSql();
     if (hasMany || query.isRawSql()) {

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -600,10 +600,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (detail != null) {
       copy.detail = detail.copy();
     }
-    if (temporalMode == TemporalMode.DRAFT) {
-      copy.temporalMode = TemporalMode.DRAFT;
-    }
-
+    copy.temporalMode = temporalMode;
     copy.firstRow = firstRow;
     copy.maxRows = maxRows;
     copy.rawWhereClause = rawWhereClause;