jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 18:05:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(system): replace DSL.trueCondition by DSL.noCondition

Browse Source 
jOOQ will then generates a query with no WHERE clause or no AND clause instead of WHERE true or WHERE 1=1
This commit is contained in:
Loïc Mathieu
2025-11-19 13:35:31 +01:00
parent 312ec2c36b
commit b3bbedaeff
24 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jdbc-h2/src/main/java/io/kestra/repository/h2/H2DashboardRepositoryService.java
View File

@@ -16,6 +16,6 @@ public abstract class H2DashboardRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

4
jdbc-h2/src/main/java/io/kestra/repository/h2/H2ExecutionRepositoryService.java
View File

@@ -32,7 +32,7 @@ public abstract class H2ExecutionRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -64,6 +64,6 @@ public abstract class H2ExecutionRepositoryService {
if (!inConditions.isEmpty()) {
conditions.add(DSL.or(inConditions));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

4
jdbc-h2/src/main/java/io/kestra/repository/h2/H2FlowRepositoryService.java
View File

@@ -31,7 +31,7 @@ public abstract class H2FlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -54,6 +54,6 @@ public abstract class H2FlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

2
jdbc-h2/src/main/java/io/kestra/repository/h2/H2KvMetadataRepositoryService.java
View File

@@ -16,6 +16,6 @@ public abstract class H2KvMetadataRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

6
jdbc-h2/src/main/java/io/kestra/repository/h2/H2Repository.java
View File

@@ -76,7 +76,7 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
public Condition fullTextCondition(List<String> fields, String query) {
if (query == null || query.equals("*")) {
return DSL.trueCondition();
return DSL.noCondition();
}
if (fields.size() > 1) {
@@ -105,12 +105,12 @@ public class H2Repository<T> extends io.kestra.jdbc.AbstractJdbcRepository<T> {
.sort(select, pageable)
.asTable("page")
)
.where(DSL.trueCondition()),
.where(DSL.noCondition()),
pageable
)
.fetch();
Integer totalCount = results.size() > 0 ? results.getFirst().get("total_count", Integer.class) : 0;
Integer totalCount = !results.isEmpty() ? results.getFirst().get("total_count", Integer.class) : 0;
List<E> map = results
.map((Record record) -> mapper.map((R) record));

2
jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlDashboardRepositoryService.java
View File

@@ -17,6 +17,6 @@ public abstract class MysqlDashboardRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(Arrays.asList("title"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

4
jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlExecutionRepositoryService.java
View File

@@ -27,7 +27,7 @@ public abstract class MysqlExecutionRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -63,7 +63,7 @@ public abstract class MysqlExecutionRepositoryService {
if(!inConditions.isEmpty()){
conditions.add(DSL.or(inConditions));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

4
jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlFlowRepositoryService.java
View File

@@ -27,7 +27,7 @@ public abstract class MysqlFlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -45,6 +45,6 @@ public abstract class MysqlFlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

2
jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlKvMetadataRepositoryService.java
View File

@@ -16,6 +16,6 @@ public abstract class MysqlKvMetadataRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("name"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

2
jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlRepository.java
View File

@@ -43,7 +43,7 @@ public class MysqlRepository<T> extends AbstractJdbcRepository<T> {
@Override
public Condition fullTextCondition(List<String> fields, String query) {
if (query == null || query.equals("*")) {
return DSL.trueCondition();
return DSL.noCondition();
}
String match = Arrays

2
jdbc-mysql/src/main/java/io/kestra/repository/mysql/MysqlTriggerRepository.java
View File

@@ -33,7 +33,7 @@ public class MysqlTriggerRepository extends AbstractJdbcTriggerRepository {
@Override
protected Condition fullTextCondition(String query) {
return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("namespace", "flow_id", "trigger_id", "execution_id"), query);
}
@Override

2
jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresDashboardRepositoryService.java
View File

@@ -17,6 +17,6 @@ public abstract class PostgresDashboardRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(Collections.singletonList("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

4
jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresExecutionRepositoryService.java
View File

@@ -26,7 +26,7 @@ public abstract class PostgresExecutionRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findLabelCondition(Either<Map<?, ?>, String> input, QueryFilter.Op operation) {
@@ -60,7 +60,7 @@ public abstract class PostgresExecutionRepositoryService {
if (!inConditions.isEmpty()) {
conditions.add(DSL.or(inConditions));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition statesFilter(List<State.Type> state) {

4
jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresFlowRepositoryService.java
View File

@@ -28,7 +28,7 @@ public abstract class PostgresFlowRepositoryService {
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<? extends FlowInterface> jdbcRepository, String query) {
@@ -49,7 +49,7 @@ public abstract class PostgresFlowRepositoryService {
}
});
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}

2
jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresKvMetadataRepositoryService.java
View File

@@ -16,6 +16,6 @@ public abstract class PostgresKvMetadataRepositoryService {
conditions.add(jdbcRepository.fullTextCondition(List.of("fulltext"), query));
}
return conditions.isEmpty() ? DSL.trueCondition() : DSL.and(conditions);
return conditions.isEmpty() ? DSL.noCondition() : DSL.and(conditions);
}
}

4
jdbc-postgres/src/main/java/io/kestra/repository/postgres/PostgresRepository.java
View File

@@ -42,7 +42,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
@Override
public Condition fullTextCondition(List<String> fields, String query) {
if (query == null || query.equals("*")) {
return DSL.trueCondition();
return DSL.noCondition();
}
if (fields.size() > 1) {
@@ -106,7 +106,7 @@ public class PostgresRepository<T> extends io.kestra.jdbc.AbstractJdbcRepository
.sort(select, pageable)
.asTable("page")
)
.where(DSL.trueCondition()),
.where(DSL.noCondition()),
pageable
)
.fetch();

7
jdbc/src/main/java/io/kestra/jdbc/AbstractJdbcRepository.java
View File

@@ -74,7 +74,7 @@ public abstract class AbstractJdbcRepository<T> {
.of(io.kestra.jdbc.repository.AbstractJdbcRepository.field("value"), MAPPER.writeValueAsString(entity))
);
}
public int count(Condition condition) {
return getDslContextWrapper()
.transactionResult(configuration -> DSL
@@ -85,7 +85,7 @@ public abstract class AbstractJdbcRepository<T> {
.fetchOne(0, Integer.class)
);
}
public void persist(T entity) {
this.persist(entity, null);
}
@@ -223,8 +223,7 @@ public abstract class AbstractJdbcRepository<T> {
.from(this
.sort(select, Pageable.from(Sort.of(Order.asc(orderField))))
.asTable("page")
)
.where(DSL.trueCondition());
);
}
@SneakyThrows

4
jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcCrudRepository.java
View File

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
* NOTE: it uses the <code>defaultFilter(tenantId)</code> for querying.
* If the child repository uses a default filter, it should override it.
* <p>
* For example, to avoid supporting allowDeleted:
* For example, to avoid supporting the <code>deleted</code> column:
* <pre>{@code
* @Override
* protected Condition defaultFilter(String tenantId) {
@@ -30,7 +30,7 @@ import java.util.stream.Stream;
*
* @Override
* protected Condition defaultFilter() {
* return DSL.trueCondition();
* return DSL.noCondition();
* }
* }</pre>
*

20
jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcExecutionRepository.java
View File

@@ -770,18 +770,16 @@ public abstract class AbstractJdbcExecutionRepository extends AbstractJdbcCrudRe
.from(this.jdbcRepository.getTable())
.where(this.defaultFilter(tenantId))
.and(NORMAL_KIND_CONDITION)
.and(DSL.or(
ListUtils.emptyOnNull(flows).isEmpty() ?
DSL.trueCondition()
.and(ListUtils.isEmpty(flows) ?
DSL.noCondition()
:
DSL.or(
flows.stream()
.map(flow -> DSL.and(
field("namespace").eq(flow.getNamespace()),
field("flow_id").eq(flow.getId())
))
.toList()
)
DSL.or(
flows.stream()
.map(flow -> DSL.and(
field("namespace").eq(flow.getNamespace()),
field("flow_id").eq(flow.getId())
))
.toList()
)
);

2
jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcKvMetadataRepository.java
View File

@@ -55,7 +55,7 @@ public abstract class AbstractJdbcKvMetadataRepository extends AbstractJdbcCrudR
boolean allowExpired,
FetchVersion fetchBehavior
) {
var condition = allowExpired ? DSL.trueCondition() : DSL.or(
var condition = allowExpired ? DSL.noCondition() : DSL.or(
field("expiration_date").greaterThan(Instant.now()),
field("expiration_date").isNull());

6
jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcSettingRepository.java
View File

@@ -34,12 +34,12 @@ public abstract class AbstractJdbcSettingRepository extends AbstractJdbcCrudRepo
@Override
public Optional<Setting> findByKey(String key) {
return findOne(DSL.trueCondition(), field("key").eq(key));
return findOne(DSL.noCondition(), field("key").eq(key));
}
@Override
public List<Setting> findAll() {
return findAll(DSL.trueCondition());
return findAll(DSL.noCondition());
}
@Override
@@ -72,6 +72,6 @@ public abstract class AbstractJdbcSettingRepository extends AbstractJdbcCrudRepo
@Override
protected Condition defaultFilter() {
return DSL.trueCondition();
return DSL.noCondition();
}
}

2
jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcTemplateRepository.java
View File

@@ -64,7 +64,7 @@ public abstract class AbstractJdbcTemplateRepository extends AbstractJdbcCrudRep
}
private Condition computeCondition(@Nullable String query, @Nullable String namespace) {
Condition condition = DSL.trueCondition();
Condition condition = DSL.noCondition();
if (query != null) {
condition = condition.and(this.findCondition(query));

14
jdbc/src/main/java/io/kestra/jdbc/repository/AbstractJdbcTriggerRepository.java
View File

@@ -72,7 +72,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
@Override
public Optional<Trigger> findLast(TriggerContext trigger) {
return findOne(DSL.trueCondition(), field("key").eq(trigger.uid()));
return findOne(DSL.noCondition(), field("key").eq(trigger.uid()));
}
@Override
@@ -82,7 +82,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
public List<Trigger> findByNextExecutionDateReadyForAllTenants(ZonedDateTime now, ScheduleContextInterface scheduleContextInterface) {
JdbcSchedulerContext jdbcSchedulerContext = (JdbcSchedulerContext) scheduleContextInterface;
return jdbcSchedulerContext.getContext()
.select(field("value"))
.from(this.jdbcRepository.getTable())
@@ -98,9 +98,9 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
.fetch()
.map(r -> this.jdbcRepository.deserialize(r.get("value", String.class)));
}
public List<Trigger> findByNextExecutionDateReadyButLockedTriggers(ZonedDateTime now) {
return this.jdbcRepository.getDslContextWrapper()
.transactionResult(configuration -> DSL.using(configuration)
.select(field("value"))
@@ -115,7 +115,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
.fetch()
.map(r -> this.jdbcRepository.deserialize(r.get("value", String.class))));
}
protected Temporal toNextExecutionTime(ZonedDateTime now) {
return now.toOffsetDateTime();
}
@@ -231,7 +231,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
}
protected Condition fullTextCondition(String query) {
return query == null ? DSL.trueCondition() : jdbcRepository.fullTextCondition(List.of("fulltext"), query);
return query == null ? DSL.noCondition() : jdbcRepository.fullTextCondition(List.of("fulltext"), query);
}
@Override
@@ -246,7 +246,7 @@ public abstract class AbstractJdbcTriggerRepository extends AbstractJdbcCrudRepo
@Override
protected Condition defaultFilter() {
return DSL.trueCondition();
return DSL.noCondition();
}
@Override

2
jdbc/src/main/java/io/kestra/jdbc/repository/JdbcFlowRepositoryService.java
View File

@@ -68,7 +68,7 @@ public abstract class JdbcFlowRepositoryService {
});
}
return conditions.size() == 0 ? DSL.trueCondition() : DSL.and(conditions);
return conditions.size() == 0 ? DSL.noCondition() : DSL.and(conditions);
}
public static Condition findSourceCodeCondition(AbstractJdbcRepository<Flow> jdbcRepository, String query) {