Skip to content

fix(sql): adds missing filtering for non-null conceptColumn in SqlMatchingStats #4010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
awildturtok merged 3 commits into from
Sep 16, 2026
Merged

fix(sql): adds missing filtering for non-null conceptColumn in SqlMatchingStats #4010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc0bce6
adds missing filtering for non-null conceptColumn in SqlMatchingStats
awildturtok Sep 7, 2026
690edb9
Merge branch 'develop' into fix/dont-count-null-columnValues
awildturtok Sep 16, 2026
a3e580a
Merge branch 'develop' into fix/dont-count-null-columnValues
awildturtok Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions backend/src/main/java/com/bakdata/conquery/sql/conquery/SqlMatchingStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.bakdata.conquery.sql.conquery;

import java.sql.Date;
import jakarta.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -237,20 +238,31 @@ private SelectJoinStep<? extends Record> createMatchingStatsStatement(TreeConcep

Field<Date>[] validityDates = collectValidityDateFields(connector);

Name tableName = name(connector.getResolvedTable().getName());

Condition condition = noCondition();

if (connector.getColumn() != null) {
condition = field(name(tableName, name(connector.getColumn().getColumn()))).isNotNull();
}

if (connector.getCondition() != null) {
CTConditionContext context = CTConditionContext.forConnector(connector, functionProvider);
condition = condition.and(connector.getCondition().convertToSqlCondition(context).condition());
}

SelectConditionStep<? extends Record> connectorTable =
dslContext.select(
TablePrimaryColumnUtil.findPrimaryColumn(connector.getResolvedTable(), defaultPrimaryColumn).as(PID_FIELD),
// The infinities are intentionally swapped
least(positiveInfinity, validityDates).as(LB_FIELD),
greatest(negativeInfinity, validityDates).as(UB_FIELD),
CONCEPT_ID_FIELD)
.from(table(name(connector.getResolvedTable().getName())))
.from(table(tableName))
.leftJoin(mapping.table())
// join onto the concept-ids table to assign the most specific id.
.on(mapping.joinCondition(connector))
.where(connector.getCondition() != null ? connector.getCondition()
.convertToSqlCondition(CTConditionContext.forConnector(connector, functionProvider))
.condition() : noCondition());
.where(condition);

connectorTables.add(connectorTable);
}
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/com/bakdata/conquery/sql/conversion/cqelement/concept/CTConditionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.bakdata.conquery.sql.conversion.cqelement.concept;

import static org.jooq.impl.DSL.name;

import com.bakdata.conquery.models.datasets.concepts.Connector;
import com.bakdata.conquery.sql.conversion.dialect.SqlFunctionProvider;
import lombok.Value;
import org.jooq.Name;

import static org.jooq.impl.DSL.name;

@Value
public class CTConditionContext {

Expand Down
Loading