Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ab5d4b0
adds warning to CachedStore, if there are duplicate keys (This can be…
awildturtok Jun 2, 2025
ce371b6
Fixes importing for FilterTests
awildturtok Jun 2, 2025
a3a7d78
minor corrections
awildturtok Jun 3, 2025
5384960
minor corrections
awildturtok Jun 3, 2025
666d64e
minor corrections
awildturtok Jun 3, 2025
dfe693e
trivial fixes where coalesce to NULL was missing
awildturtok Jun 3, 2025
eb587d1
fix order of AllValuesAggregator test
awildturtok Jun 3, 2025
a123a2b
use coalesce for createEmptyRangeForNullValues
awildturtok Jun 3, 2025
831f575
Fix boolean Parsing for CsvTableImporter
awildturtok Jun 3, 2025
bc40de4
Cleanup
awildturtok Jun 3, 2025
c2b0015
fixes importing of previous results
awildturtok Jun 3, 2025
34b41d0
Fixes importing of AllIdsTable
awildturtok Jun 3, 2025
3b972a2
Merge branch 'develop' into feature/sql-run-all-tests
awildturtok Jun 3, 2025
d6e9a50
Fixes loading of SqlTestDataImporter.java by inherint from WorkerTest…
awildturtok Jun 30, 2025
8b96457
Disable some tests
awildturtok Jun 30, 2025
0f56b1b
fixes scanning for tests in sql mode => .test.json
awildturtok Jul 1, 2025
cee41a5
Disable some tests
awildturtok Jul 1, 2025
d5661e5
fix: treat no validity date as +/- inf
jnsrnhld Jul 2, 2025
34dfc26
fix: parse empty array expression as null
jnsrnhld Jul 2, 2025
7282b96
REVERT_ME: move sql tests to excluded dir
jnsrnhld Jul 2, 2025
d9785f9
fix: intersection of validity dates with date restriction
jnsrnhld Jul 2, 2025
83804e8
fix: parsing of booleans
jnsrnhld Jul 2, 2025
800d3a2
fix: validity dates if start and end are null
jnsrnhld Jul 2, 2025
343c716
fix: full export form conversion
jnsrnhld Jul 3, 2025
a586c37
fix: validity date exclusion
jnsrnhld Jul 3, 2025
af34b8e
Fixes COALESCE behaviour of SumDiff Aggregation
awildturtok Jul 7, 2025
5fd7b7e
feat: implement DURATION_SUM filter conversion
jnsrnhld Jul 7, 2025
067fe60
fix: fix ExistsSelect conversion without manipulating the parser
jnsrnhld Jul 8, 2025
a782257
fix: apply ExistsConversion fix to forms too
jnsrnhld Jul 8, 2025
65abae9
fix: use coalesce for ExistsSelect final representation
jnsrnhld Jul 8, 2025
6814582
fix: negation for simple cases
jnsrnhld Jul 18, 2025
d80b8a6
fix: negation for nested cases
jnsrnhld Sep 24, 2025
08bcc89
Merge remote-tracking branch 'origin/develop' into feature/sql-run-al…
awildturtok Jan 6, 2026
c38d10a
deactivates tests using daterange from hana
awildturtok Jan 6, 2026
a5048c8
disables failing HANA tests
awildturtok Feb 25, 2026
15f30e9
Merge branch 'develop' into feature/sql-run-all-tests
awildturtok Feb 25, 2026
6b47e23
adds aggregators after merge
awildturtok Feb 25, 2026
f32918c
disables TEMPORAL queries for SQL testing
awildturtok Feb 25, 2026
826464c
disables DURATION_SUM tests
awildturtok Feb 25, 2026
a54cc15
fix CsvTableImporter
awildturtok Feb 25, 2026
96c5231
fixes Selects
awildturtok Mar 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.Setter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;

/**
Expand All @@ -38,6 +39,7 @@
@CPSType(id = "ARRAY_CONCEPT_QUERY", base = QueryDescription.class)
@Slf4j
@NoArgsConstructor(access = AccessLevel.PRIVATE, onConstructor_ = {@JsonCreator})
@ToString
public class ArrayConceptQuery extends Query {

@NotEmpty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.bakdata.conquery.models.query.resultinfo.printers.common.LocalizedEnumPrinter;
import com.bakdata.conquery.models.types.ResultType;
import com.bakdata.conquery.models.types.SemanticType;
import com.bakdata.conquery.sql.execution.ResultSetProcessor;
import lombok.experimental.UtilityClass;

@UtilityClass
Expand All @@ -27,6 +28,11 @@ public static ResultInfo datesInfo() {
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dates();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getDateRangeList;
}
};
}

Expand All @@ -39,6 +45,11 @@ public static ResultInfo historyDatesInfo() {
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dates();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getDateRangeList;
}
};
}

Expand All @@ -48,6 +59,11 @@ public static ResultInfo sourceInfo() {
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).source();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getString;
}
};
}

Expand All @@ -58,6 +74,11 @@ public static ResultInfo formContextInfo() {
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).index();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getInteger;
}
};
}

Expand All @@ -68,6 +89,11 @@ public static ResultInfo formDateRangeInfo() {
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).dateRange();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getDateRange;
}
};
}

Expand All @@ -83,6 +109,11 @@ public Printer createPrinter(PrinterFactory printerFactory, PrintSettings printS
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).resolution();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getString;
}
};
}

Expand All @@ -93,6 +124,11 @@ public static ResultInfo formEventDateInfo() {
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).eventDate();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getDate;
}
};
}

Expand All @@ -108,6 +144,11 @@ public Printer createPrinter(PrinterFactory printerFactory, PrintSettings printS
public String userColumnName(PrintSettings printSettings) {
return C10nCache.getLocalized(ResultHeadersC10n.class, printSettings.getLocale()).observationScope();
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getString;
}
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ public SqlFilters convertToSqlFilter(SqlIdColumns ids, ConversionContext context
FilterContext<VALUE> filterContext = FilterContext.forConceptConversion(ids, readValue(), context, tables);
final Filter<VALUE> resolve = (Filter<VALUE>) filter.resolve();
SqlFilters sqlFilters = resolve.createConverter().convertToSqlFilter(resolve, filterContext);
if (context.isNegation()) {
return new SqlFilters(sqlFilters.getSelects(), sqlFilters.getWhereClauses().negated());
}
return sqlFilters;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.bakdata.conquery.models.query.resultinfo.FixedLabelResultInfo;
import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
import com.bakdata.conquery.models.types.ResultType;
import com.bakdata.conquery.sql.execution.ResultSetProcessor;
import com.bakdata.conquery.util.QueryUtils;
import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -129,6 +130,11 @@ public String userColumnName(PrintSettings printSettings) {
public String defaultColumnName(PrintSettings printSettings) {
return defaultLabel(printSettings.getLocale());
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getBoolean;
}
});
}
return resultInfos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.bakdata.conquery.models.query.resultinfo.FixedLabelResultInfo;
import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
import com.bakdata.conquery.models.types.ResultType;
import com.bakdata.conquery.sql.execution.ResultSetProcessor;
import com.bakdata.conquery.util.QueryUtils;
import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -134,6 +135,11 @@ public String userColumnName(PrintSettings printSettings) {
public String defaultColumnName(PrintSettings printSettings) {
return defaultLabel(printSettings.getLocale());
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getBoolean;
}
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
import com.bakdata.conquery.models.query.resultinfo.printers.common.ListResultInfo;
import com.bakdata.conquery.models.types.ResultType;
import com.bakdata.conquery.sql.execution.ResultSetProcessor;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.Data;
import lombok.Setter;
Expand Down Expand Up @@ -188,6 +189,11 @@ public List<ResultInfo> getResultInfos() {
public String userColumnName(PrintSettings printSettings) {
return C10N.get(ResultHeadersC10n.class, printSettings.getLocale()).temporalCompareLabel(compare.userLabel(printSettings.getLocale()));
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getDateRangeList;
}
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ public void toCSV(List<ResultInfo> idHeaders, List<ResultInfo> infos, Stream<Ent
createCSVBody(cfg, infos, resultStream, printSettings, StringResultPrinters.forCharset(charset));
}

private void createCSVBody(PrintSettings cfg, List<ResultInfo> infos, Stream<EntityResult> results, PrintSettings printSettings,
PrinterFactory printerFactory) {
private void createCSVBody(
PrintSettings cfg, List<ResultInfo> infos, Stream<EntityResult> results, PrintSettings printSettings,
PrinterFactory printerFactory) {
final Printer[] printers = infos.stream().map(info -> info.createPrinter(printerFactory, printSettings)).toArray(Printer[]::new);

results.map(result -> Pair.of(cfg.getIdMapper().map(result), result))
Expand All @@ -52,20 +53,19 @@ private void createCSVBody(PrintSettings cfg, List<ResultInfo> infos, Stream<Ent
public void printLine(EntityPrintId entity, Printer[] printers, Object[] values) {
// Cast here to Object[] so it is clear to intellij that the varargs call is intended
writer.addValues((Object[]) entity.getExternalId());
try {
for (int i = 0; i < printers.length; i++) {
final Object value = values[i];

if (value == null) {
writer.addValue("");
continue;
}
for (int i = 0; i < printers.length; i++) {
final Object value = values[i];

if (value == null) {
writer.addValue("");
continue;
}
try {
writer.addValue(printers[i].apply(value));
}
}
catch (Exception e) {
throw new IllegalStateException("Unable to print line " + Arrays.deepToString(values), e);
catch (Exception e) {
throw new IllegalStateException("Failed to print column %s of line %s".formatted(i, Arrays.deepToString(values)), e);
}
}

writer.writeValuesToRow();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.bakdata.conquery.models.query.resultinfo.ResultInfo;
import com.bakdata.conquery.models.types.ResultType;
import com.bakdata.conquery.models.types.SemanticType;
import com.bakdata.conquery.sql.execution.ResultSetProcessor;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Functions;
import com.google.common.collect.MoreCollectors;
Expand Down Expand Up @@ -139,6 +140,11 @@ public String userColumnName(PrintSettings printSettings) {
labels.size() == 1 ? labels.values().stream().collect(MoreCollectors.onlyElement()) : col.getField()
), col.getField());
}

@Override
public ResultSetProcessor.Reader<?> createReader(ResultSetProcessor resultSetProcessor) {
return resultSetProcessor::getString;
}
};
}).collect(Collectors.toUnmodifiableList());
}
Expand Down
Loading
Loading