feat(jdbc): add a defaultFilter to revision

kestra-io · Jul 24, 2023 · fc5a8e9 · fc5a8e9
1 parent 033d3fe
commit fc5a8e9
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcFlowRepository.java b/jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcFlowRepository.java
@@ -83,7 +83,8 @@ public Optional<Flow> findById(String namespace, String id, Optional<Integer> re
                     from = context
                         .select(field("value", String.class))
                         .from(jdbcRepository.getTable())
-                        .where(field("namespace").eq(namespace))
+                        .where(this.revisionDefaultFilter())
+                        .and(field("namespace").eq(namespace))
                         .and(field("id", String.class).eq(id))
                         .and(field("revision", Integer.class).eq(revision.get()));
                 } else {
@@ -99,6 +100,10 @@ public Optional<Flow> findById(String namespace, String id, Optional<Integer> re
             });
     }
 
+    protected Condition revisionDefaultFilter() {
+        return DSL.trueCondition();
+    }
+
     @Override
     public Optional<FlowWithSource> findByIdWithSource(String namespace, String id, Optional<Integer> revision) {
         return jdbcRepository
@@ -113,7 +118,8 @@ public Optional<FlowWithSource> findByIdWithSource(String namespace, String id,
                             field("value", String.class)
                         )
                         .from(jdbcRepository.getTable())
-                        .where(field("namespace").eq(namespace))
+                        .where(this.revisionDefaultFilter())
+                        .and(field("namespace").eq(namespace))
                         .and(field("id", String.class).eq(id))
                         .and(field("revision", Integer.class).eq(integer)))
                     .orElseGet(() -> context
@@ -150,7 +156,8 @@ public List<FlowWithSource> findRevisions(String namespace, String id) {
                         field("value", String.class)
                     )
                     .from(jdbcRepository.getTable())
-                    .where(field("namespace", String.class).eq(namespace))
+                    .where(this.revisionDefaultFilter())
+                    .and(field("namespace", String.class).eq(namespace))
                     .and(field("id", String.class).eq(id))
                     .orderBy(field("revision", Integer.class).asc());