finalSelect = flagAggregation.qualify(connectorTables.getPredecessor(ConceptCteStep.AGGREGATION_FILTER));
+ ExtractingSqlSelect finalSelect = flagAggregation.qualify(connectorTables.getPredecessor(ConceptCteStep.AGGREGATION_FILTER));
return ConnectorSqlSelects.builder()
.preprocessingSelects(rootSelects.values())
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ClickhouseDistinctSelectConverter.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ClickhouseDistinctSelectConverter.java
new file mode 100644
index 0000000000..2bd0a0adea
--- /dev/null
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ClickhouseDistinctSelectConverter.java
@@ -0,0 +1,67 @@
+package com.bakdata.conquery.sql.conversion.model.select;
+
+import static org.jooq.impl.DSL.field;
+
+import com.bakdata.conquery.models.datasets.concepts.select.connector.DistinctSelect;
+import com.bakdata.conquery.models.datasets.concepts.select.connector.specific.MappableSingleColumnSelect;
+import com.bakdata.conquery.sql.conversion.cqelement.concept.ConceptCteStep;
+import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorSqlTables;
+import com.bakdata.conquery.sql.conversion.model.Selects;
+import com.bakdata.conquery.sql.conversion.model.SqlIdColumns;
+
+/**
+ *
+ * The two additional CTEs this aggregator creates:
+ *
+ * -
+ * Select distinct values of a column.
+ * {@code
+ * "distinct" as (
+ * select distinct "pid", "column"
+ * from "event_filter"
+ * )
+ * }
+ *
+ * -
+ * String agg all distinct values of the column.
+ * {@code
+ * "aggregated" as (
+ * select
+ * "select-1-distinct"."pid",
+ * string_agg(cast("column" as varchar), cast(' ' as varchar) ) as "select-1"
+ * from "distinct"
+ * group by "pid"
+ * )
+ * }
+ *
+ *
+ *
+ */
+public class ClickhouseDistinctSelectConverter implements SelectConverter {
+
+
+ @Override
+ public ConnectorSqlSelects connectorSelect(DistinctSelect distinctSelect, SelectContext selectContext) {
+
+ String alias = selectContext.getNameGenerator().selectName(distinctSelect);
+
+ ConnectorSqlTables tables = selectContext.getTables();
+ SingleColumnSqlSelect preprocessingSelect =
+ MappableSingleColumnSelect.getSubstringSelect(distinctSelect.getColumn().get(), distinctSelect.getSubstringRange(), selectContext, alias);
+
+ String eventFilterTable = selectContext.getTables().cteName(ConceptCteStep.EVENT_FILTER);
+ SingleColumnSqlSelect qualified = preprocessingSelect.qualify(eventFilterTable);
+
+ FieldWrapper grouped = new FieldWrapper<>(field("arrayFilter(x -> x <> '' and x is not null, groupUniqArray({0}))", Object.class, qualified.select()).as(alias), qualified.select().getName());
+
+ SingleColumnSqlSelect finalSelect = grouped.qualify(tables.cteName(ConceptCteStep.AGGREGATION_SELECT));
+
+ return ConnectorSqlSelects.builder()
+ .preprocessingSelect(preprocessingSelect)
+ .aggregationSelect(grouped)
+ .finalSelect(finalSelect)
+ .build();
+ }
+
+
+}
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/DaterangeSelectUtil.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/DaterangeSelectUtil.java
index c8fecc732b..69922694b3 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/DaterangeSelectUtil.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/DaterangeSelectUtil.java
@@ -135,8 +135,8 @@ public static FieldWrapper createDurationSumSqlSelect(String alias,
}
private static Condition containsInfinityDate(ColumnDateRange validityDate, SqlFunctionProvider functionProvider) {
- Field negativeInfinity = functionProvider.toDateField(functionProvider.getMinDateExpression());
- Field positiveInfinity = functionProvider.toDateField(functionProvider.getMaxDateExpression());
+ Field negativeInfinity = (functionProvider.getMinDateExpression());
+ Field positiveInfinity = (functionProvider.getMaxDateExpression());
return validityDate.getStart().eq(negativeInfinity).or(validityDate.getEnd().eq(positiveInfinity));
}
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/EventDurationSumSelectConverter.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/EventDurationSumSelectConverter.java
index e7e8bbd88d..7a9b21307b 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/EventDurationSumSelectConverter.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/EventDurationSumSelectConverter.java
@@ -60,8 +60,8 @@ private FieldWrapper createEventDurationSumAggregation(EventDuration
}
private static Condition containsInfinityDate(ColumnDateRange validityDate, SqlFunctionProvider functionProvider) {
- Field negativeInfinity = functionProvider.toDateField(functionProvider.getMinDateExpression());
- Field positiveInfinity = functionProvider.toDateField(functionProvider.getMaxDateExpression());
+ Field negativeInfinity = functionProvider.getMinDateExpression();
+ Field positiveInfinity = functionProvider.getMaxDateExpression();
return validityDate.getStart().eq(negativeInfinity).or(validityDate.getEnd().eq(positiveInfinity));
}
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ValueSelectUtil.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ValueSelectUtil.java
index fce8fb56be..572958fd25 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ValueSelectUtil.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/model/select/ValueSelectUtil.java
@@ -60,6 +60,8 @@ private static QueryStep buildRowNumberStep(
SingleColumnSqlSelect rootSelect, Function, ? extends SortField> ordering, String alias,
SelectContext selectContext) {
+ SqlFunctionProvider functionProvider = selectContext.getFunctionProvider();
+
String predecessor = selectContext.getTables().getPredecessor(ConceptCteStep.AGGREGATION_SELECT);
Field qualifiedRootSelect = rootSelect.qualify(predecessor).select();
@@ -70,12 +72,12 @@ private static QueryStep buildRowNumberStep(
new FieldWrapper<>(qualifiedRootSelect.as(alias), qualifiedRootSelect.getName()),
rowNumberField(predecessor, selectContext.getValidityDate(), ordering,
selectContext.getIds(),
- selectContext.getFunctionProvider()
+ functionProvider
)
))
.build())
.cteName(ValueSelectCteStep.ROW_NUMBER_STEP.cteName(alias))
- .conditions(List.of(qualifiedRootSelect.isNotNull(), selectContext.getValidityDate().map(ColumnDateRange::isNotEmpty).orElse(noCondition())))
+ .conditions(List.of(qualifiedRootSelect.isNotNull(), selectContext.getValidityDate().map(functionProvider::isNotEmptyDateRange).orElse(noCondition())))
.fromTable(table(name(predecessor)))
.build();
}
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/ConceptQueryConverter.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/ConceptQueryConverter.java
index 09916a17aa..8078a2bb8e 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/ConceptQueryConverter.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/ConceptQueryConverter.java
@@ -93,6 +93,7 @@ private Selects getFinalSelects(ConceptQuery conceptQuery, Selects preFinalSelec
return preFinalSelects.blockValidityDate();
}
else if (preFinalSelects.getValidityDate().isEmpty()) {
+ // TODO i think this is unreachable?
return preFinalSelects.withValidityDate(functionProvider.allRange());
}
Field validityDateStringAggregation = functionProvider.dateRangeAggregation(preFinalSelects.getValidityDate().get());
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/FormConversionHelper.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/FormConversionHelper.java
index d9977af200..05876ea091 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/FormConversionHelper.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/FormConversionHelper.java
@@ -68,7 +68,7 @@ public QueryStep convertPrerequisite(Query query, ConversionContext context) {
Condition dateNotNullCondition;
if (columnDateRange.isPresent()) {
- dateNotNullCondition = columnDateRange.get().isNotNull();
+ dateNotNullCondition = context.getFunctionProvider().isNotEmptyDateRange(columnDateRange.get());
}
else {
dateNotNullCondition = falseCondition();
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/TableExportQueryConverter.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/TableExportQueryConverter.java
index 22bf0ebb30..aed767d590 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/TableExportQueryConverter.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/conversion/query/TableExportQueryConverter.java
@@ -1,5 +1,15 @@
package com.bakdata.conquery.sql.conversion.query;
+import static org.jooq.impl.DSL.*;
+import static org.jooq.impl.DSL.field;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
import com.bakdata.conquery.apiv1.query.Query;
import com.bakdata.conquery.apiv1.query.TableExportQuery;
import com.bakdata.conquery.apiv1.query.concept.filter.CQTable;
@@ -21,12 +31,6 @@
import com.bakdata.conquery.sql.conversion.model.select.FieldWrapper;
import com.bakdata.conquery.util.TablePrimaryColumnUtil;
import com.google.common.base.Preconditions;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
import lombok.RequiredArgsConstructor;
import org.jooq.Condition;
import org.jooq.Field;
@@ -46,39 +50,6 @@ public class TableExportQueryConverter implements NodeConverter getConversionClass() {
- return TableExportQuery.class;
- }
-
- @Override
- public ConversionContext convert(TableExportQuery tableExportQuery, ConversionContext context) {
-
- final QueryStep convertedPrerequisite = convertPrerequisite(tableExportQuery, context);
- final Map positions = tableExportQuery.getPositions();
- final CDateRange dateRestriction = CDateRange.of(tableExportQuery.getDateRange());
-
- final List convertedTables = tableExportQuery.getConcepts().stream()
- .flatMap(concept -> concept.getTables().stream().map(table -> convertTable(
- table,
- concept,
- dateRestriction,
- convertedPrerequisite,
- positions,
- context
- )))
- .toList();
-
- final QueryStep unionedTables = QueryStep.createUnionAllStep(
- convertedTables,
- null, // no CTE name required as this step will be the final select
- List.of(convertedPrerequisite)
- );
- final Select selectQuery = queryStepTransformer.toSelectQuery(unionedTables);
-
- return context.withFinalQuery(new SqlQuery(selectQuery, tableExportQuery.getResultInfos()));
- }
-
/**
* Converts the {@link Query} of the given {@link TableExportQuery} and creates another {@link QueryStep} on top which extracts only the primary id.
*/
@@ -142,12 +113,16 @@ private static QueryStep convertTable(
}
private static Optional convertTablesValidityDate(CQTable table, String alias, ConversionContext context) {
+
+ final SqlFunctionProvider functionProvider = context.getFunctionProvider();
+
if (table.findValidityDate() == null) {
- return Optional.of(context.getFunctionProvider().emptyColumnDateRange());
+ return Optional.of(functionProvider.emptyColumnDateRange());
}
- final SqlFunctionProvider functionProvider = context.getFunctionProvider();
- final ColumnDateRange validityDate = functionProvider.forValidityDate(table.findValidityDate());
- return Optional.of(validityDate.asValidityDateRange(alias));
+
+ final Field validityDateField = functionProvider.dateRangeToField(functionProvider.forValidityDate(table.findValidityDate()));
+
+ return Optional.of(ColumnDateRange.of(validityDateField).asValidityDateRange(alias));
}
private static List> initializeFields(CQTable cqTable, Map positions) {
@@ -176,8 +151,8 @@ private static Table joinConnectorTableWithPrerequisite(
ConversionContext context
) {
final SqlFunctionProvider functionProvider = context.getFunctionProvider();
- final Table connectorTable = DSL.table(DSL.name(cqTable.getConnector().resolve().resolveTableId().getTable()));
- final Table convertedPrerequisiteTable = DSL.table(DSL.name(convertedPrerequisite.getCteName()));
+ final Table connectorTable = table(name(cqTable.getConnector().resolve().resolveTableId().getTable()));
+ final Table convertedPrerequisiteTable = table(name(convertedPrerequisite.getCteName()));
final ColumnDateRange validityDate = functionProvider.forValidityDate(cqTable.findValidityDate());
final List joinConditions = Stream.concat(
@@ -195,7 +170,7 @@ private static Field[] createPlaceholders(Map positions) {
// if columns have the same computed position, they can share a common name because they will be unioned over multiple tables anyway
for (int index = 0; index < exportColumns.length; index++) {
- final Field columnSelect = DSL.inline(null, Object.class).as("null-%d".formatted(index));
+ final Field columnSelect = inline(null, Object.class).as("null-%d".formatted(index));
exportColumns[index] = columnSelect;
}
@@ -204,13 +179,46 @@ private static Field[] createPlaceholders(Map positions) {
private static Field createSourceInfoSelect(CQTable cqTable) {
final String tableName = cqTable.getConnector().resolve().resolveTableId().getTable();
- return DSL.inline(tableName).as(SharedAliases.SOURCE.getAlias());
+ return inline(tableName).as(SharedAliases.SOURCE.getAlias());
}
private static Field createColumnSelect(Column column, int position) {
final String columnName = "%s-%s".formatted(column.getName(), position);
- return DSL.field(DSL.name(column.getTable().getName(), column.getName()))
+ return field(name(column.getTable().getName(), column.getName()))
.as(columnName);
}
+ @Override
+ public Class getConversionClass() {
+ return TableExportQuery.class;
+ }
+
+ @Override
+ public ConversionContext convert(TableExportQuery tableExportQuery, ConversionContext context) {
+
+ final QueryStep convertedPrerequisite = convertPrerequisite(tableExportQuery, context);
+ final Map positions = tableExportQuery.getPositions();
+ final CDateRange dateRestriction = CDateRange.of(tableExportQuery.getDateRange());
+
+ final List convertedTables = tableExportQuery.getConcepts().stream()
+ .flatMap(concept -> concept.getTables().stream().map(table -> convertTable(
+ table,
+ concept,
+ dateRestriction,
+ convertedPrerequisite,
+ positions,
+ context
+ )))
+ .toList();
+
+ final QueryStep unionedTables = QueryStep.createUnionAllStep(
+ convertedTables,
+ null, // no CTE name required as this step will be the final select
+ List.of(convertedPrerequisite)
+ );
+ final Select selectQuery = queryStepTransformer.toSelectQuery(unionedTables);
+
+ return context.withFinalQuery(new SqlQuery(selectQuery, tableExportQuery.getResultInfos()));
+ }
+
}
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/execution/HanaSqlCDateSetParser.java b/backend/src/main/java/com/bakdata/conquery/sql/execution/HanaSqlCDateSetParser.java
index 6f8912b556..81fe66563e 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/execution/HanaSqlCDateSetParser.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/execution/HanaSqlCDateSetParser.java
@@ -1,11 +1,11 @@
package com.bakdata.conquery.sql.execution;
-import static com.bakdata.conquery.sql.conversion.dialect.HanaSqlFunctionProvider.DATE_SET_SEPARATOR;
+import static com.bakdata.conquery.sql.conversion.dialect.hana.HanaSqlFunctionProvider.DATE_SET_SEPARATOR;
import java.util.Collections;
import java.util.Set;
-import com.bakdata.conquery.sql.conversion.dialect.HanaSqlFunctionProvider;
+import com.bakdata.conquery.sql.conversion.dialect.hana.HanaSqlFunctionProvider;
import com.bakdata.conquery.util.DateReader;
public class HanaSqlCDateSetParser extends DefaultCDateSetParser {
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/execution/PgSqlCDateSetParser.java b/backend/src/main/java/com/bakdata/conquery/sql/execution/PgSqlCDateSetParser.java
index 253a7db001..4046e4e262 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/execution/PgSqlCDateSetParser.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/execution/PgSqlCDateSetParser.java
@@ -3,7 +3,7 @@
import java.util.Collections;
import java.util.Set;
-import com.bakdata.conquery.sql.conversion.dialect.PostgreSqlFunctionProvider;
+import com.bakdata.conquery.sql.conversion.dialect.pg.PostgreSqlFunctionProvider;
import com.bakdata.conquery.util.DateReader;
public class PgSqlCDateSetParser extends DefaultCDateSetParser {
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/execution/SqlExecutionService.java b/backend/src/main/java/com/bakdata/conquery/sql/execution/SqlExecutionService.java
index 883ef9d1ef..8ea1f193b2 100644
--- a/backend/src/main/java/com/bakdata/conquery/sql/execution/SqlExecutionService.java
+++ b/backend/src/main/java/com/bakdata/conquery/sql/execution/SqlExecutionService.java
@@ -65,6 +65,7 @@ private SqlExecutionExecutionInfo createStatementAndExecute(SqlQuery sqlQuery, C
}
// not all DB vendors throw SQLExceptions
catch (SQLException | RuntimeException e) {
+ log.error("", e);
throw new ConqueryError.SqlError(e);
}
}
diff --git a/backend/src/test/java/com/bakdata/conquery/integration/IntegrationTests.java b/backend/src/test/java/com/bakdata/conquery/integration/IntegrationTests.java
index fc3773a5c7..8b9fbc2a6e 100644
--- a/backend/src/test/java/com/bakdata/conquery/integration/IntegrationTests.java
+++ b/backend/src/test/java/com/bakdata/conquery/integration/IntegrationTests.java
@@ -17,6 +17,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.annotation.CheckForNull;
import com.bakdata.conquery.TestTags;
import com.bakdata.conquery.integration.json.ConqueryTestSpec;
@@ -68,7 +69,7 @@ public class IntegrationTests {
}
@Getter
- public final ConqueryConfig config = new ConqueryConfig();
+ public final ConqueryConfig config = new ConqueryConfig();
private final Map reusedInstances = new HashMap<>();
private final String defaultTestRoot;
private final String defaultTestRootPackage;
@@ -182,25 +183,34 @@ private List collectTestTree(ResourceTree tree, String testRoot, Te
final ResourceTree reduced = tree.reduce();
if (reduced.getChildren().isEmpty()) {
- return Collections.singletonList(collectTests(reduced, testImporter, sqlDialect));
+ return collectTests(reduced, testImporter, sqlDialect)
+ .map(List::of)
+ .orElse(Collections.emptyList());
}
return reduced.getChildren().values().stream()
.map(currentDir -> collectTests(currentDir, testImporter, sqlDialect))
+ .flatMap(Optional::stream)
.collect(Collectors.toList());
}
- private DynamicNode collectTests(ResourceTree currentDir, TestDataImporter testImporter, Dialect sqlDialect) {
+ private Optional collectTests(ResourceTree currentDir, TestDataImporter testImporter, Dialect sqlDialect) {
if (currentDir.getValue() != null) {
Optional dynamicTest = readTest(currentDir.getValue(), currentDir.getName(), testImporter, sqlDialect);
if (dynamicTest.isPresent()) {
- return dynamicTest.get();
+ return Optional.of(dynamicTest.get());
}
}
List list = new ArrayList<>();
for (ResourceTree child : currentDir.getChildren().values()) {
- list.add(collectTests(child, testImporter, sqlDialect));
+ collectTests(child, testImporter, sqlDialect)
+ .ifPresent(list::add);
}
- return toDynamicContainer(currentDir, list);
+
+ if (list.isEmpty()) {
+ return Optional.empty();
+ }
+
+ return Optional.of(toDynamicContainer(currentDir, list));
}
private Optional readTest(Resource resource, String name, TestDataImporter testImporter, Dialect sqlDialect) {
diff --git a/backend/src/test/java/com/bakdata/conquery/integration/sql/CsvTableImporter.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/CsvTableImporter.java
index 7b9af73b18..3c54aed42e 100644
--- a/backend/src/test/java/com/bakdata/conquery/integration/sql/CsvTableImporter.java
+++ b/backend/src/test/java/com/bakdata/conquery/integration/sql/CsvTableImporter.java
@@ -140,7 +140,7 @@ private void dropTable(Table table, Statement statement) {
private void createTable(Table table, List> columns, Statement statement) throws SQLException {
String createTableStatement = testSqlDialect.getTestFunctionProvider().createTableStatement(table, columns, dslContext);
- log.debug("Creating table: {}", createTableStatement);
+ log.info("Creating table: {}", createTableStatement);
statement.execute(createTableStatement);
}
@@ -152,7 +152,7 @@ private Field createField(RequiredColumn requiredColumn) {
case BOOLEAN -> SQLDataType.BOOLEAN;
// TODO (ja) how do we handle REAL and DECIMAL properly?
case REAL, DECIMAL, MONEY -> SQLDataType.DECIMAL(10, 2);
- case DATE -> SQLDataType.DATE;
+ case DATE -> SQLDataType.DATE.nullable(true);
case DATE_RANGE -> new BuiltInDataType<>(DateRange.class, "daterange");
};
diff --git a/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/ClickhouseSqlIntegrationTests.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/ClickhouseSqlIntegrationTests.java
new file mode 100644
index 0000000000..86abcb6afb
--- /dev/null
+++ b/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/ClickhouseSqlIntegrationTests.java
@@ -0,0 +1,179 @@
+package com.bakdata.conquery.integration.sql.dialect;
+
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import com.bakdata.conquery.TestTags;
+import com.bakdata.conquery.integration.ConqueryIntegrationTests;
+import com.bakdata.conquery.integration.IntegrationTests;
+import com.bakdata.conquery.integration.json.SqlTestDataImporter;
+import com.bakdata.conquery.integration.json.TestDataImporter;
+import com.bakdata.conquery.integration.sql.CsvTableImporter;
+import com.bakdata.conquery.mode.local.ManagedConnection;
+import com.bakdata.conquery.models.config.DatabaseConnectionConfig;
+import com.bakdata.conquery.models.config.Dialect;
+import com.bakdata.conquery.sql.conversion.dialect.clickhouse.ClickhouseDialectBundle;
+import com.google.common.base.Strings;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.jooq.DSLContext;
+import org.jooq.Field;
+import org.jooq.InsertValuesStepN;
+import org.jooq.Record;
+import org.jooq.RowN;
+import org.jooq.Table;
+import org.jooq.conf.ParamType;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DynamicNode;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestFactory;
+import org.testcontainers.clickhouse.ClickHouseContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.utility.DockerImageName;
+
+@Slf4j
+public class ClickhouseSqlIntegrationTests extends IntegrationTests {
+
+ // SAP does not provide more than 1 image and on an update, the earlier image is deleted from dockerhub, thus latest tag is fine
+ private final static DockerImageName IMAGE_TAGE = DockerImageName.parse("clickhouse/clickhouse-server");
+ private static boolean useLocal = true;
+ private static DSLContext dslContext;
+ private static ManagedConnection managedConnection;
+
+ static {
+ final String raw = System.getenv("USE_LOCAL_CH_DB");
+ if (!Strings.isNullOrEmpty(raw)) {
+ useLocal = Boolean.parseBoolean(raw);
+ }
+ }
+
+ public ClickhouseSqlIntegrationTests() {
+ super(ConqueryIntegrationTests.DEFAULT_SQL_TEST_ROOT, "com.bakdata.conquery.integration");
+ }
+
+
+ @SneakyThrows
+ @AfterAll
+ public static void tearDownClass() {
+
+ }
+
+ @BeforeAll
+ static void before() throws Exception {
+ TestContextProvider provider = useLocal
+ ? new ClickhouseTestContainerContextProvider()
+ : new RemoteClickhouseContextProvider();
+
+ log.info("Running Clickhouse tests with {}.", provider.getClass().getSimpleName());
+
+ managedConnection = new ManagedConnection("test", provider.getSqlConnectorConfig(), provider.getDatabaseConfig(), null);
+ managedConnection.start();
+
+ dslContext = managedConnection.connect();
+ }
+
+ @AfterAll
+ static void after() throws Exception {
+ managedConnection.stop();
+ }
+
+ @TestFactory
+ @Tag(TestTags.INTEGRATION_SQL_BACKEND)
+ public Stream sqlBackendTests() {
+
+ DatabaseConnectionConfig databaseConfig = managedConnection.getConnection();
+ TestDialectBundle testHanaDialect = new TestClickhouseDialectBundle();
+ TestDataImporter testDataImporter = new SqlTestDataImporter(new CsvTableImporter(dslContext, testHanaDialect, databaseConfig));
+
+
+ return Stream.concat(
+ super.sqlProgrammaticTests(databaseConfig, managedConnection.getConfig(), testDataImporter),
+ super.sqlQueryTests(databaseConfig, managedConnection.getConfig(), testDataImporter).stream()
+ );
+ }
+
+ public static class TestClickhouseDialectBundle extends ClickhouseDialectBundle implements TestDialectBundle {
+
+ public TestFunctionProvider getTestFunctionProvider() {
+ return new ClickhouseTestFunctionProvider();
+ }
+
+ }
+
+ private static class ClickhouseTestFunctionProvider implements TestFunctionProvider {
+
+ @Override
+ public void insertValuesIntoTable(Table table, List> columns, List content, Statement statement, DSLContext dslContext) {
+
+ List statements = new ArrayList<>();
+ for (RowN rowN : content) {
+ InsertValuesStepN values = dslContext.insertInto(table, columns)
+ .values(rowN);
+ statements.add(values);
+ }
+
+ dslContext.batch(statements)
+ .execute();
+ }
+
+ @Override
+ public String createDropTableStatement(Table table, DSLContext dslContext) {
+ return dslContext.dropTable(table)
+ .getSQL(ParamType.INLINED);
+ }
+
+ }
+
+ @Getter
+ private static class ClickhouseTestContainerContextProvider implements TestContextProvider {
+
+ private final DatabaseConnectionConfig databaseConfig;
+ private final TestSqlConnectorConfig sqlConnectorConfig;
+
+ @Container
+ private final ClickHouseContainer container;
+
+ public ClickhouseTestContainerContextProvider() {
+ this.container = new ClickHouseContainer(IMAGE_TAGE);
+ this.container.start();
+
+ this.databaseConfig = DatabaseConnectionConfig.builder()
+ .dialect(Dialect.CLICKHOUSE)
+ .jdbcConnectionUrl(container.getJdbcUrl())
+ .databaseUsername(container.getUsername())
+ .databasePassword(container.getPassword())
+ .build();
+ this.sqlConnectorConfig = new TestSqlConnectorConfig(databaseConfig);
+ }
+ }
+
+ @Getter
+ private static class RemoteClickhouseContextProvider implements TestContextProvider {
+
+ private final static String PORT = Objects.requireNonNullElse(System.getenv("CONQUERY_SQL_PORT"), "8123");
+ private final static String HOST = System.getenv("CONQUERY_SQL_HOST");
+ private final static String CONNECTION_URL = "jdbc:clickhouse://%s:%s/".formatted(HOST, PORT);
+ private final static String USERNAME = Objects.requireNonNullElse(System.getenv("CONQUERY_SQL_USER"), "default");
+ private final static String PASSWORD = System.getenv("CONQUERY_SQL_PASSWORD");
+
+ private final DatabaseConnectionConfig databaseConfig;
+ private final TestSqlConnectorConfig sqlConnectorConfig;
+
+ public RemoteClickhouseContextProvider() {
+ this.databaseConfig = DatabaseConnectionConfig.builder()
+ .dialect(Dialect.CLICKHOUSE)
+ .jdbcConnectionUrl(CONNECTION_URL)
+ .databaseUsername(USERNAME)
+ .databasePassword(PASSWORD)
+ .build();
+ this.sqlConnectorConfig = new TestSqlConnectorConfig(databaseConfig);
+ }
+
+ }
+
+}
diff --git a/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/HanaSqlIntegrationTests.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/HanaSqlIntegrationTests.java
index 04f52676a7..2ddb45dc1e 100644
--- a/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/HanaSqlIntegrationTests.java
+++ b/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/HanaSqlIntegrationTests.java
@@ -24,7 +24,7 @@
import com.bakdata.conquery.mode.local.ManagedConnection;
import com.bakdata.conquery.models.config.DatabaseConnectionConfig;
import com.bakdata.conquery.models.config.Dialect;
-import com.bakdata.conquery.sql.conversion.dialect.HanaDialectBundle;
+import com.bakdata.conquery.sql.conversion.dialect.hana.HanaDialectBundle;
import com.google.common.base.Strings;
import lombok.Getter;
import lombok.SneakyThrows;
diff --git a/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java b/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java
index 0675bd21f7..537a00c3e9 100644
--- a/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java
+++ b/backend/src/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java
@@ -13,7 +13,7 @@
import com.bakdata.conquery.models.config.Dialect;
import com.bakdata.conquery.models.error.ConqueryError;
import com.bakdata.conquery.models.i18n.I18n;
-import com.bakdata.conquery.sql.conversion.dialect.PostgreDialectBundle;
+import com.bakdata.conquery.sql.conversion.dialect.pg.PostgreDialectBundle;
import com.bakdata.conquery.sql.conversion.model.SqlQuery;
import com.bakdata.conquery.sql.execution.ResultSetProcessor;
import com.bakdata.conquery.sql.execution.SqlExecutionService;
diff --git a/backend/src/test/java/com/bakdata/conquery/integration/tests/SqlSchemaValidationTest.java b/backend/src/test/java/com/bakdata/conquery/integration/tests/SqlSchemaValidationTest.java
index 4606c2a22a..d822f84c29 100644
--- a/backend/src/test/java/com/bakdata/conquery/integration/tests/SqlSchemaValidationTest.java
+++ b/backend/src/test/java/com/bakdata/conquery/integration/tests/SqlSchemaValidationTest.java
@@ -13,6 +13,7 @@
import com.bakdata.conquery.integration.common.RequiredTable;
import com.bakdata.conquery.integration.json.SqlTestDataImporter;
import com.bakdata.conquery.integration.sql.CsvTableImporter;
+import com.bakdata.conquery.models.config.Dialect;
import com.bakdata.conquery.models.datasets.Column;
import com.bakdata.conquery.models.datasets.Table;
import com.bakdata.conquery.models.events.MajorTypeId;
@@ -29,6 +30,7 @@
*/
@Slf4j
public class SqlSchemaValidationTest implements ProgrammaticIntegrationTest {
+
@Override
public Set forModes() {
return Set.of(StandaloneSupport.Mode.SQL);
@@ -39,6 +41,12 @@ public void execute(String name, TestConquery testConquery) throws Exception {
StandaloneSupport support = testConquery.getSupport("dataset");
+ if (support.getConfig().getSqlConnectorConfig().getDatabaseConfigs().values()
+ .stream().allMatch(dbconf -> dbconf.getDialect().equals(Dialect.CLICKHOUSE))) {
+ log.info("Clickhouse validation does not work.");
+ return;
+ }
+
CsvTableImporter importer = ((SqlTestDataImporter) testConquery.getTestDataImporter()).getCsvTableImporter();
String tableName = "test_table";
diff --git a/backend/src/test/resources/EXCLUDED_sql/date_restriction/postgres_daterange/daterange_column.test.json b/backend/src/test/resources/EXCLUDED_sql/date_restriction/postgres_daterange/daterange_column.test.json
index 2ab0296b1c..96f91e812b 100644
--- a/backend/src/test/resources/EXCLUDED_sql/date_restriction/postgres_daterange/daterange_column.test.json
+++ b/backend/src/test/resources/EXCLUDED_sql/date_restriction/postgres_daterange/daterange_column.test.json
@@ -3,7 +3,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"label": "Date restriction with a daterange column validity date (PostgreSQL only)",
diff --git a/backend/src/test/resources/EXCLUDED_sql/filter/count_quarters/postgres/daterange_column.test.json b/backend/src/test/resources/EXCLUDED_sql/filter/count_quarters/postgres/daterange_column.test.json
index 8abe667031..cfa063e942 100644
--- a/backend/src/test/resources/EXCLUDED_sql/filter/count_quarters/postgres/daterange_column.test.json
+++ b/backend/src/test/resources/EXCLUDED_sql/filter/count_quarters/postgres/daterange_column.test.json
@@ -3,7 +3,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"label": "COUNT_QUARTERS filter on single postgres daterange column",
diff --git a/backend/src/test/resources/EXCLUDED_sql/selects/count_quarters/postgres/daterange_column.test.json b/backend/src/test/resources/EXCLUDED_sql/selects/count_quarters/postgres/daterange_column.test.json
index 2cf3d26649..ea50600f7c 100644
--- a/backend/src/test/resources/EXCLUDED_sql/selects/count_quarters/postgres/daterange_column.test.json
+++ b/backend/src/test/resources/EXCLUDED_sql/selects/count_quarters/postgres/daterange_column.test.json
@@ -3,7 +3,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"label": "COUNT_QUARTERS on single postgres daterange column",
diff --git a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index 955fa02f2f..539eecd6ea 100644
--- a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/COUNT_QUARTERS_AGGREGATOR/expected.csv",
@@ -36,7 +37,8 @@
"table": "table",
"validityDates": {
"label": "datum",
- "column": "table.datum"
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
},
"selects": {
"name" : "select",
@@ -62,8 +64,12 @@
"type": "DATE"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/content.csv
index 083de65dfc..7e533f9896 100644
--- a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_AGGREGATOR/content.csv
@@ -1,13 +1,13 @@
-pid,behandlungsdatum,datum
-1,2015-03-16,"2015-01-01/2016-12-31"
-1,2015-03-17,"2015-01-01/2016-12-31"
-2,2015-03-31,"2015-01-01/2016-12-31"
-2,2015-04-01,"2015-01-01/2016-12-31"
-3,2015-02-01,"2015-01-01/2016-12-31"
-3,2015-04-01,"2015-01-01/2016-12-31"
-3,2015-07-01,"2015-01-01/2016-12-31"
-3,2015-11-01,"2015-01-01/2016-12-31"
-4,2015-03-31,"2015-01-01/2016-12-31"
-4,2015-04-01,"2015-01-01/2016-12-31"
-4,2015-07-01,"2015-01-01/2016-12-31"
-5,,"2015-01-01/2016-12-31"
\ No newline at end of file
+pid,behandlungsdatum,start,ende
+1,2015-03-16,"2015-01-01","2016-12-31"
+1,2015-03-17,"2015-01-01","2016-12-31"
+2,2015-03-31,"2015-01-01","2016-12-31"
+2,2015-04-01,"2015-01-01","2016-12-31"
+3,2015-02-01,"2015-01-01","2016-12-31"
+3,2015-04-01,"2015-01-01","2016-12-31"
+3,2015-07-01,"2015-01-01","2016-12-31"
+3,2015-11-01,"2015-01-01","2016-12-31"
+4,2015-03-31,"2015-01-01","2016-12-31"
+4,2015-04-01,"2015-01-01","2016-12-31"
+4,2015-07-01,"2015-01-01","2016-12-31"
+5,,"2015-01-01","2016-12-31"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
new file mode 100644
index 0000000000..23b967c1e5
--- /dev/null
+++ b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -0,0 +1,72 @@
+{
+ "type": "QUERY_TEST",
+ "label": "COUNT_QUARTERS_AGGREGATOR Test",
+ "sqlSpec": {
+ "isEnabled": true,
+ "supportedDialects": [
+ "POSTGRESQL"
+ ]
+ },
+ "expectedCsv": "tests/aggregator/COUNT_QUARTERS_RANGE/expected.csv",
+ "query": {
+ "type": "CONCEPT_QUERY",
+ "root": {
+ "ids": [
+ "concept"
+ ],
+ "type": "CONCEPT",
+ "tables": [
+ {
+ "id": "concept.connector",
+ "selects": [
+ "concept.connector.select"
+ ]
+ }
+ ]
+
+ }
+ },
+ "concepts": [
+ {
+ "name": "concept",
+ "type": "TREE",
+ "connectors": [
+ {
+ "label": "connector",
+ "table": "table",
+ "validityDates": {
+ "label": "datum",
+ "column": "table.datum"
+ },
+ "selects": {
+ "name" : "select",
+ "type": "COUNT_QUARTERS",
+ "column": "table.behandlungsdatum"
+ }
+ }
+ ]
+ }
+ ],
+ "content": {
+ "tables": [
+ {
+ "csv": "tests/aggregator/COUNT_QUARTERS_RANGE/content.csv",
+ "name": "table",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "behandlungsdatum",
+ "type": "DATE"
+ },
+ {
+ "name": "datum",
+ "type": "DATE_RANGE"
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/content.csv b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/content.csv
new file mode 100644
index 0000000000..083de65dfc
--- /dev/null
+++ b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/content.csv
@@ -0,0 +1,13 @@
+pid,behandlungsdatum,datum
+1,2015-03-16,"2015-01-01/2016-12-31"
+1,2015-03-17,"2015-01-01/2016-12-31"
+2,2015-03-31,"2015-01-01/2016-12-31"
+2,2015-04-01,"2015-01-01/2016-12-31"
+3,2015-02-01,"2015-01-01/2016-12-31"
+3,2015-04-01,"2015-01-01/2016-12-31"
+3,2015-07-01,"2015-01-01/2016-12-31"
+3,2015-11-01,"2015-01-01/2016-12-31"
+4,2015-03-31,"2015-01-01/2016-12-31"
+4,2015-04-01,"2015-01-01/2016-12-31"
+4,2015-07-01,"2015-01-01/2016-12-31"
+5,,"2015-01-01/2016-12-31"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/expected.csv b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/expected.csv
new file mode 100644
index 0000000000..dd76afa65c
--- /dev/null
+++ b/backend/src/test/resources/tests/aggregator/COUNT_QUARTERS_RANGE/expected.csv
@@ -0,0 +1,6 @@
+result,dates,concept select
+1,{2015-01-01/2016-12-31},1
+2,{2015-01-01/2016-12-31},2
+3,{2015-01-01/2016-12-31},4
+4,{2015-01-01/2016-12-31},3
+5,{2015-01-01/2016-12-31},
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/DURATION_SUM.test.json b/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/DURATION_SUM.test.json
index 3a54197372..35ec814fdd 100644
--- a/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/DURATION_SUM.test.json
+++ b/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/DURATION_SUM.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/DURATION_SUM_AGGREGATOR/expected.csv",
@@ -35,12 +36,14 @@
"table": "table",
"validityDates": {
"label": "datum",
- "column": "table.datum"
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
},
"selects": {
"type": "DURATION_SUM",
"name": "select",
- "column": "table.datum"
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
}
}
]
@@ -57,8 +60,12 @@
},
"columns": [
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/content.csv
index 4eb17469e2..cdfeaa7675 100644
--- a/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/DURATION_SUM_AGGREGATOR/content.csv
@@ -1,8 +1,8 @@
-pid,datum
-1,"2010-01-01/2010-01-31"
-3,"2013-08-10/2013-08-11"
-4,"2010-06-15/2010-06-20"
-4,"2010-06-16/2010-06-18"
-5,"2011-03-02/2011-03-10"
-5,"2011-03-05/2011-03-13"
-6,"/2011-03-13"
\ No newline at end of file
+pid,start,ende
+1,"2010-01-01","2010-01-31"
+3,"2013-08-10","2013-08-11"
+4,"2010-06-15","2010-06-20"
+4,"2010-06-16","2010-06-18"
+5,"2011-03-02","2011-03-10"
+5,"2011-03-05","2011-03-13"
+6,,"2011-03-13"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/DURATION_SUM_DISTINCT_AGGREGATOR/DURATION_SUM.test.json b/backend/src/test/resources/tests/aggregator/DURATION_SUM_DISTINCT_AGGREGATOR/DURATION_SUM.test.json
index 51b3429c18..c7247a6fc8 100644
--- a/backend/src/test/resources/tests/aggregator/DURATION_SUM_DISTINCT_AGGREGATOR/DURATION_SUM.test.json
+++ b/backend/src/test/resources/tests/aggregator/DURATION_SUM_DISTINCT_AGGREGATOR/DURATION_SUM.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/DURATION_SUM_DISTINCT_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_NO_RESTRICTION.test.json b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_NO_RESTRICTION.test.json
index 692fcca436..9bcb107b3c 100644
--- a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_NO_RESTRICTION.test.json
+++ b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_NO_RESTRICTION.test.json
@@ -1,10 +1,11 @@
{
"type": "QUERY_TEST",
"label": "EVENT_DATE_AGGREGATOR_NO_RESTRICTION Test",
- "sqlSpec": {
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/EVENT_DATE_AGGREGATOR/expected_no_restriction.csv",
@@ -18,7 +19,9 @@
"tables": [
{
"id": "concept.connector",
- "selects": "concept.connector.event-date"
+ "selects": [
+ "concept.connector.event-date"
+ ]
}
],
"selects": "concept.event-date"
@@ -34,18 +37,23 @@
"table": "table",
"validityDates": {
"label": "indexdatum",
- "column": "table.indexdatum"
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
},
- "selects": {
- "type": "EVENT_DATE_UNION",
- "name": "event-date"
- }
+ "selects": [
+ {
+ "type": "EVENT_DATE_UNION",
+ "name": "event-date"
+ }
+ ]
}
],
- "selects": {
- "type": "EVENT_DATE_UNION",
- "name": "event-date"
- }
+ "selects": [
+ {
+ "type": "EVENT_DATE_UNION",
+ "name": "event-date"
+ }
+ ]
}
],
"content": {
@@ -59,8 +67,12 @@
},
"columns": [
{
- "name": "indexdatum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
},
{
"name": "geburtsdatum",
diff --git a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_RESTRICTION.test.json b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_RESTRICTION.test.json
index e420c4fc6b..3f36d2ee76 100644
--- a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_RESTRICTION.test.json
+++ b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/EVENT_DATE_AGGREGATOR_RESTRICTION.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/EVENT_DATE_AGGREGATOR/expected_restriction.csv",
@@ -37,11 +38,12 @@
"type": "TREE",
"connectors": [
{
- "label": "connector",
+ "name": "connector",
"table": "table",
"validityDates": {
- "label": "indexdatum",
- "column": "table.indexdatum"
+ "name": "indexdatum",
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
},
"selects": {
"type": "EVENT_DATE_UNION",
@@ -66,8 +68,12 @@
},
"columns": [
{
- "name": "indexdatum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
},
{
"name": "geburtsdatum",
diff --git a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/content.csv
index ddfdc58317..1006a5430b 100644
--- a/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/EVENT_DATE_AGGREGATOR/content.csv
@@ -1,11 +1,11 @@
-pid,indexdatum,geburtsdatum
-1,"2010-01-01/2010-03-31",2010-01-31
-2,"2010-01-01/2010-03-31",1998-01-01
-3,"2010-01-01/2010-03-31",1997-12-31
-4,"2010-01-01/2010-03-31",
-5,"2010-01-01/2010-03-31",2011-01-01
-6,"2010-01-01/2010-03-31",1998-03-01
-7,"2010-01-01/2010-03-31",2010-01-31
-8,"2010-01-01/2010-03-31",1998-03-01
-9,"2010-01-01/2010-03-31",1998-04-01
-10,"2010-01-01/2010-03-31",2012-01-01
\ No newline at end of file
+pid,start,ende,geburtsdatum
+1,"2010-01-01","2010-03-31",2010-01-31
+2,"2010-01-01","2010-03-31",1998-01-01
+3,"2010-01-01","2010-03-31",1997-12-31
+4,"2010-01-01","2010-03-31",
+5,"2010-01-01","2010-03-31",2011-01-01
+6,"2010-01-01","2010-03-31",1998-03-01
+7,"2010-01-01","2010-03-31",2010-01-31
+8,"2010-01-01","2010-03-31",1998-03-01
+9,"2010-01-01","2010-03-31",1998-04-01
+10,"2010-01-01","2010-03-31",2012-01-01
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/NUMBER.test.json b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/NUMBER.test.json
index 85e69af173..be5d99f1f5 100644
--- a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/NUMBER.test.json
+++ b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/NUMBER.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/EXISTS_AGGREGATOR/expected.csv",
@@ -47,7 +48,8 @@
"table": "table",
"validityDates": {
"label": "datum",
- "column": "table.datum"
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
},
"filters": {
"label": "filter",
@@ -73,8 +75,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/content.csv
index 24556a3454..1babf7262e 100644
--- a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR/content.csv
@@ -1,8 +1,8 @@
-pid,value,datum
-1,1,"2014-06-30/2015-06-30"
-2,1,"2014-06-30/2015-06-30"
-2,2,"2014-06-30/2015-06-30"
-3,3,"2014-06-30/2015-06-30"
-4,,"2014-06-30/2015-06-30"
-5,1,"2014-06-30/2015-06-30"
-5,,"2014-06-30/2015-06-30"
+pid,value,start,ende
+1,1,"2014-06-30","2015-06-30"
+2,1,"2014-06-30","2015-06-30"
+2,2,"2014-06-30","2015-06-30"
+3,3,"2014-06-30","2015-06-30"
+4,,"2014-06-30","2015-06-30"
+5,1,"2014-06-30","2015-06-30"
+5,,"2014-06-30","2015-06-30"
diff --git a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/NUMBER.test.json b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/NUMBER.test.json
index 28c87d6bf5..47657c0410 100644
--- a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/NUMBER.test.json
+++ b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/NUMBER.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/EXISTS_AGGREGATOR_OR/expected.csv",
@@ -74,7 +75,8 @@
"table": "table",
"validityDates": {
"label": "datum",
- "column": "table.datum"
+ "startColumn": "table.start",
+ "endColumn": "table.ende"
},
"filters": {
"label": "value",
@@ -101,8 +103,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/content.csv b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/content.csv
index 24556a3454..1babf7262e 100644
--- a/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/EXISTS_AGGREGATOR_OR/content.csv
@@ -1,8 +1,8 @@
-pid,value,datum
-1,1,"2014-06-30/2015-06-30"
-2,1,"2014-06-30/2015-06-30"
-2,2,"2014-06-30/2015-06-30"
-3,3,"2014-06-30/2015-06-30"
-4,,"2014-06-30/2015-06-30"
-5,1,"2014-06-30/2015-06-30"
-5,,"2014-06-30/2015-06-30"
+pid,value,start,ende
+1,1,"2014-06-30","2015-06-30"
+2,1,"2014-06-30","2015-06-30"
+2,2,"2014-06-30","2015-06-30"
+3,3,"2014-06-30","2015-06-30"
+4,,"2014-06-30","2015-06-30"
+5,1,"2014-06-30","2015-06-30"
+5,,"2014-06-30","2015-06-30"
diff --git a/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index fba3354bf6..236b8c26d4 100644
--- a/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/FIRST_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/content.csv
index c1de39e465..76dcc14bb1 100644
--- a/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/FIRST_AGGREGATOR/content.csv
@@ -8,4 +8,3 @@ pid,datum,value
5,2012-01-01,"m"
5,,"f"
6,2012-01-01,"m"
-6,2012-01-01,"f"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
index 02364f081b..6834d251ff 100644
--- a/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
+++ b/backend/src/test/resources/tests/aggregator/FLAGS_AGGREGATOR/FLAGS_AGGREGATOR.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/FLAGS_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index c08a548044..442b52fc33 100644
--- a/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/LAST_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/content.csv
index bb1adca9de..3a33a7f81f 100644
--- a/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/content.csv
@@ -9,5 +9,3 @@ pid,datum,value
4,,"f"
5,2012-01-01,"m"
5,,"f"
-6,2012-01-01,"m"
-6,2012-01-01,"f"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/expected.csv b/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/expected.csv
index 018d2a35a4..440b512dcd 100644
--- a/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/LAST_AGGREGATOR/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},f
5,{2012-01-01/2012-01-01},m
-6,{2012-01-01/2012-01-01},m
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index ecc5110997..17064c082c 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/MAPPED/DISTINCT/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/expected.csv b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/expected.csv
index c8cd2026db..b328490919 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},{hello}
5,{2012-01-01/2012-01-01},{int2}
-6,{2012-01-01/2012-01-01},"{int2,hello}"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index 19bcea3b42..a1b4909aed 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/MAPPED/DISTINCT_MULTI/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/expected.csv b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/expected.csv
index 85c148ff89..0b2f2987c2 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/DISTINCT_MULTI/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},"{goodbye,hello}"
5,{2012-01-01/2012-01-01},{int2}
-6,{2012-01-01/2012-01-01},"{int2,goodbye,hello}"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index 86ed03ad78..2ef50af243 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/MAPPED/FIRST/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/expected.csv b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/expected.csv
index a391f52733..f7eba07a90 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},External: hello world
5,{2012-01-01/2012-01-01},External: ext2
-6,{2012-01-01/2012-01-01},External: ext2
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index 9ef8481673..bfbfcb8165 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/MAPPED/FIRST_MULTI/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/expected.csv b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/expected.csv
index e7b1b0541d..8fb8073097 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/FIRST_MULTI/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},"{External: hello world,External: goodbye moon}"
5,{2012-01-01/2012-01-01},{External: ext2}
-6,{2012-01-01/2012-01-01},{External: ext2}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/MAPPED/content.csv b/backend/src/test/resources/tests/aggregator/MAPPED/content.csv
index 7c4c553b55..cd9314b52a 100644
--- a/backend/src/test/resources/tests/aggregator/MAPPED/content.csv
+++ b/backend/src/test/resources/tests/aggregator/MAPPED/content.csv
@@ -9,5 +9,3 @@ pid,datum,value
4,,int1
5,2012-01-01,int2
5,,int1
-6,2012-01-01,int2
-6,2012-01-01,int1
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/QUARTER_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/QUARTER_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index e1b97554f2..9e45f8c522 100644
--- a/backend/src/test/resources/tests/aggregator/QUARTER_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/QUARTER_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/QUARTER_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index f7472b1d89..ea7977786f 100644
--- a/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/RANDOM_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/content.csv b/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/content.csv
index 6d99b9f9e5..0566d5ffd9 100644
--- a/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/aggregator/RANDOM_AGGREGATOR/content.csv
@@ -5,4 +5,3 @@ pid,datum,value
5,2012-01-01,"m"
5,,"f"
6,2012-01-01,"m"
-6,2012-01-01,"f"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/MAPPED.test.json b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/MAPPED.test.json
index 2bc93f414f..d15c8fd121 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/MAPPED.test.json
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/MAPPED.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/SUBSTRING/DISTINCT/expected-mapped.csv",
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/SIMPLE.test.json b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/SIMPLE.test.json
index 88a8bcf908..72a32bc888 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/SIMPLE.test.json
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/SIMPLE.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/SUBSTRING/DISTINCT/expected-simple.csv",
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-mapped.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-mapped.csv
index 9716ddef9d..167f4b7492 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-mapped.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-mapped.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},
5,{2012-01-01/2012-01-01},{in}
-6,{2012-01-01/2012-01-01},"{hello,t2}"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-simple.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-simple.csv
index e4f3864d9e..0a4e5f3af1 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-simple.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT/expected-simple.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},
5,{2012-01-01/2012-01-01},{in}
-6,{2012-01-01/2012-01-01},"{t1,t2}"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/MAPPED.test.json b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/MAPPED.test.json
index e04a99cee2..92f9332bbe 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/MAPPED.test.json
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/MAPPED.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/SUBSTRING/DISTINCT_MULTI/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/expected.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/expected.csv
index 23b2e9a8a6..e1a75a04f2 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/DISTINCT_MULTI/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},
5,{2012-01-01/2012-01-01},{in}
-6,{2012-01-01/2012-01-01},"{goodbye,hello,t2}"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/MAPPED.test.json b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/MAPPED.test.json
index bd867a63b0..f9ea853755 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/MAPPED.test.json
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/MAPPED.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/SUBSTRING/FIRST/expected-mapped.csv",
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/SIMPLE.test.json b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/SIMPLE.test.json
index a1f6e3452f..be542f9b10 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/SIMPLE.test.json
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/SIMPLE.test.json
@@ -4,7 +4,8 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "CLICKHOUSE"
]
},
"expectedCsv": "tests/aggregator/SUBSTRING/FIRST/expected.csv",
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-mapped.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-mapped.csv
index bc061d9ce0..e8e2e3e547 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-mapped.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-mapped.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},
5,{2012-01-01/2012-01-01},in
-6,{2012-01-01/2012-01-01},External: ext2
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-multi.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-multi.csv
index 31a9728df9..58b6047f9e 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-multi.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected-multi.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},{}
5,{2012-01-01/2012-01-01},{in}
-6,{2012-01-01/2012-01-01},{t2}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected.csv
index f3004ccea8..612667a777 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/FIRST/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},
5,{2012-01-01/2012-01-01},in
-6,{2012-01-01/2012-01-01},t2
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/aggregator/SUBSTRING/content.csv b/backend/src/test/resources/tests/aggregator/SUBSTRING/content.csv
index d5cbb1b238..f72b94d6b3 100644
--- a/backend/src/test/resources/tests/aggregator/SUBSTRING/content.csv
+++ b/backend/src/test/resources/tests/aggregator/SUBSTRING/content.csv
@@ -9,5 +9,3 @@ pid,datum,value
4,,int1
5,2012-01-01,__int2
5,,int1__
-6,2012-01-01,int2
-6,2012-01-01,int1
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/filter/COUNT_DISTINCT_MULTI/COUNT.test.json b/backend/src/test/resources/tests/filter/COUNT_DISTINCT_MULTI/COUNT.test.json
index 581a0b2451..e5fb531af5 100644
--- a/backend/src/test/resources/tests/filter/COUNT_DISTINCT_MULTI/COUNT.test.json
+++ b/backend/src/test/resources/tests/filter/COUNT_DISTINCT_MULTI/COUNT.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/filter/COUNT_DISTINCT_MULTI/expected_COUNT_Filter.csv",
diff --git a/backend/src/test/resources/tests/filter/COUNT_QUARTERS/COUNT_QUARTERS.test.json b/backend/src/test/resources/tests/filter/COUNT_QUARTERS/COUNT_QUARTERS.test.json
index 3a4589ec32..a66b6de389 100644
--- a/backend/src/test/resources/tests/filter/COUNT_QUARTERS/COUNT_QUARTERS.test.json
+++ b/backend/src/test/resources/tests/filter/COUNT_QUARTERS/COUNT_QUARTERS.test.json
@@ -1,10 +1,10 @@
{
"type": "FILTER_TEST",
"label": "COUNT_QUARTERS Test",
- "expectedCsv": "tests/filter/COUNT_QUARTERS/expected_COUNT_QUARTERS_Filter.csv",
+ "expectedCsv": "tests/filter/COUNT_QUARTERS/expected.csv",
"content": {
"tables": {
- "csv": "tests/filter/COUNT_QUARTERS/content_COUNT_QUARTERS_Filter.csv",
+ "csv": "tests/filter/COUNT_QUARTERS/content.csv",
"primaryColumn": {
"name": "pid",
"type": "STRING"
diff --git a/backend/src/test/resources/tests/filter/COUNT_QUARTERS/content_COUNT_QUARTERS_Filter.csv b/backend/src/test/resources/tests/filter/COUNT_QUARTERS/content.csv
similarity index 100%
rename from backend/src/test/resources/tests/filter/COUNT_QUARTERS/content_COUNT_QUARTERS_Filter.csv
rename to backend/src/test/resources/tests/filter/COUNT_QUARTERS/content.csv
diff --git a/backend/src/test/resources/tests/filter/COUNT_QUARTERS/expected_COUNT_QUARTERS_Filter.csv b/backend/src/test/resources/tests/filter/COUNT_QUARTERS/expected.csv
similarity index 100%
rename from backend/src/test/resources/tests/filter/COUNT_QUARTERS/expected_COUNT_QUARTERS_Filter.csv
rename to backend/src/test/resources/tests/filter/COUNT_QUARTERS/expected.csv
diff --git a/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/COUNT_QUARTERS.test.json b/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/COUNT_QUARTERS.test.json
index 570455eaea..ba8d6c4fe1 100644
--- a/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/COUNT_QUARTERS.test.json
+++ b/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/COUNT_QUARTERS.test.json
@@ -1,16 +1,17 @@
{
"type": "FILTER_TEST",
"label": "COUNT_QUARTERS Test",
- "sqlSpec": {
+ "sqlSpec": {
"isEnabled": true,
+ "comment": "Hana does not support dateRanges and this specifically targets dateRanges",
"supportedDialects": [
"POSTGRESQL"
]
},
- "expectedCsv": "tests/filter/COUNT_QUARTERS_RANGE/expected_COUNT_QUARTERS_Filter.csv",
+ "expectedCsv": "tests/filter/COUNT_QUARTERS_RANGE/expected.csv",
"content": {
"tables": {
- "csv": "tests/filter/COUNT_QUARTERS_RANGE/content_COUNT_QUARTERS_Filter.csv",
+ "csv": "tests/filter/COUNT_QUARTERS_RANGE/content.csv",
"primaryColumn": {
"name": "pid",
"type": "STRING"
diff --git a/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/content_COUNT_QUARTERS_Filter.csv b/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/content.csv
similarity index 100%
rename from backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/content_COUNT_QUARTERS_Filter.csv
rename to backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/content.csv
diff --git a/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/expected_COUNT_QUARTERS_Filter.csv b/backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/expected.csv
similarity index 100%
rename from backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/expected_COUNT_QUARTERS_Filter.csv
rename to backend/src/test/resources/tests/filter/COUNT_QUARTERS_RANGE/expected.csv
diff --git a/backend/src/test/resources/tests/filter/COUNTfalse/COUNT.test.json b/backend/src/test/resources/tests/filter/COUNTfalse/COUNT.test.json
index 764f9e34a4..4e0a1d2a92 100644
--- a/backend/src/test/resources/tests/filter/COUNTfalse/COUNT.test.json
+++ b/backend/src/test/resources/tests/filter/COUNTfalse/COUNT.test.json
@@ -1,12 +1,6 @@
{
"type": "FILTER_TEST",
"label": "COUNTfalse Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/filter/COUNTfalse/expected_COUNT_Filter.csv",
"content": {
"tables": {
@@ -22,7 +16,7 @@
},
{
"name": "datum",
- "type": "DATE_RANGE"
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/filter/DURATION_SUM/DURATION_SUM.test.json b/backend/src/test/resources/tests/filter/DURATION_SUM/DURATION_SUM.test.json
index ee863aef04..3b23ac00f0 100644
--- a/backend/src/test/resources/tests/filter/DURATION_SUM/DURATION_SUM.test.json
+++ b/backend/src/test/resources/tests/filter/DURATION_SUM/DURATION_SUM.test.json
@@ -1,12 +1,6 @@
{
"type": "FILTER_TEST",
"label": "DURATION_SUM Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/filter/DURATION_SUM/expected_DURATION_SUM_Filter.csv",
"content": {
"tables": {
@@ -17,8 +11,12 @@
},
"columns": [
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
@@ -26,12 +24,14 @@
"connector": {
"validityDates": [
{
- "label": "Dauer",
- "column": "table.datum"
+ "name": "dauer",
+ "startColumn": "table.start",
+ "endColumn": "table.end"
}
],
"filters": {
- "column": "table.datum",
+ "startColumn": "table.start",
+ "endColumn": "table.end",
"type": "DURATION_SUM"
}
},
diff --git a/backend/src/test/resources/tests/filter/DURATION_SUM/content_DURATION_SUM_Filter.csv b/backend/src/test/resources/tests/filter/DURATION_SUM/content_DURATION_SUM_Filter.csv
index b52f8968ed..37f58b71c8 100644
--- a/backend/src/test/resources/tests/filter/DURATION_SUM/content_DURATION_SUM_Filter.csv
+++ b/backend/src/test/resources/tests/filter/DURATION_SUM/content_DURATION_SUM_Filter.csv
@@ -1,7 +1,7 @@
-pid,datum
-1,"2010-01-01/2010-01-31"
-3,"2013-08-10/2013-08-11"
-4,"2010-06-15/2010-06-20"
-4,"2010-06-16/2010-06-18"
-5,"2011-03-02/2011-03-10"
-5,"2011-03-05/2011-03-13"
+pid,start,end
+1,2010-01-01,2010-01-31
+3,2013-08-10,2013-08-11
+4,2010-06-15,2010-06-20
+4,2010-06-16,2010-06-18
+5,2011-03-02,2011-03-10
+5,2011-03-05,2011-03-13
diff --git a/backend/src/test/resources/tests/filter/DURATION_SUM_2/DURATION_SUM_2.test.json b/backend/src/test/resources/tests/filter/DURATION_SUM_2/DURATION_SUM_2.test.json
index ed0ad8188e..01d17a09fc 100644
--- a/backend/src/test/resources/tests/filter/DURATION_SUM_2/DURATION_SUM_2.test.json
+++ b/backend/src/test/resources/tests/filter/DURATION_SUM_2/DURATION_SUM_2.test.json
@@ -1,12 +1,6 @@
{
"type": "FILTER_TEST",
"label": "DURATION_SUM_2 Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/filter/DURATION_SUM_2/expected_DURATION_SUM_2_Filter.csv",
"content": {
"tables": {
@@ -17,8 +11,12 @@
},
"columns": [
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
@@ -26,12 +24,14 @@
"connector": {
"validityDates": [
{
- "label": "Dauer",
- "column": "table.datum"
+ "label": "dauer",
+ "startColumn": "table.start",
+ "endColumn": "table.end"
}
],
"filters": {
- "column": "table.datum",
+ "startColumn": "table.start",
+ "endColumn": "table.end",
"type": "DURATION_SUM"
}
},
diff --git a/backend/src/test/resources/tests/filter/DURATION_SUM_2/content_DURATION_SUM_2_Filter.csv b/backend/src/test/resources/tests/filter/DURATION_SUM_2/content_DURATION_SUM_2_Filter.csv
index e82488e056..159860276d 100644
--- a/backend/src/test/resources/tests/filter/DURATION_SUM_2/content_DURATION_SUM_2_Filter.csv
+++ b/backend/src/test/resources/tests/filter/DURATION_SUM_2/content_DURATION_SUM_2_Filter.csv
@@ -1,8 +1,8 @@
-pid,datum
-1,"2010-01-01/2010-01-31"
-3,"2013-08-10/2013-08-10"
-4,"2010-06-15/2010-06-20"
-4,"2010-06-16/2010-06-18"
-5,"2011-03-02/2011-03-10"
-5,"2011-03-05/2011-03-13"
-6,""
\ No newline at end of file
+pid,start,end
+1,2010-01-01,2010-01-31
+3,2013-08-10,2013-08-10
+4,2010-06-15,2010-06-20
+4,2010-06-16,2010-06-18
+5,2011-03-02,2011-03-10
+5,2011-03-05,2011-03-13
+6,
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/filter/DURATION_SUM_DISTINCT_FILTER/DURATION_SUM.test.json b/backend/src/test/resources/tests/filter/DURATION_SUM_DISTINCT_FILTER/DURATION_SUM.test.json
index d969b24905..f50002d79b 100644
--- a/backend/src/test/resources/tests/filter/DURATION_SUM_DISTINCT_FILTER/DURATION_SUM.test.json
+++ b/backend/src/test/resources/tests/filter/DURATION_SUM_DISTINCT_FILTER/DURATION_SUM.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/filter/DURATION_SUM_DISTINCT_FILTER/expected.csv",
diff --git a/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json b/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
index 84273b61c9..edb210ef5b 100644
--- a/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
+++ b/backend/src/test/resources/tests/filter/FLAGS_FILTER/FLAGS_FILTER.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/filter/FLAGS_FILTER/expected.csv",
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SECONDARY_ID/ABS_EXPORT_FORM_SECONDARY_ID.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SECONDARY_ID/ABS_EXPORT_FORM_SECONDARY_ID.test.json
index 139ba38898..0fb26bfce0 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SECONDARY_ID/ABS_EXPORT_FORM_SECONDARY_ID.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SECONDARY_ID/ABS_EXPORT_FORM_SECONDARY_ID.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM.test.json
index 35f6a220f2..d477afdd76 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json
index 0ccb786c60..1738d42582 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/AND_DR.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/AND_DR.test.json
index f87df4f78d..8879a8be0e 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/AND_DR.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/AND_DR.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/DR_AND.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/DR_AND.test.json
index 5b8985c467..1806575137 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/DR_AND.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ABSOLUT/SIMPLE_DATE_RESTRICTION/DR_AND.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL/ABS_EXPORT_FORM.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL/ABS_EXPORT_FORM.test.json
index 727d90dcf4..d9b331b11b 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL/ABS_EXPORT_FORM.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL/ABS_EXPORT_FORM.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL_WITH_EXCLUDE/ABS_EXPORT_FORM.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL_WITH_EXCLUDE/ABS_EXPORT_FORM.test.json
index 65d3827d68..854203318a 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL_WITH_EXCLUDE/ABS_EXPORT_FORM.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/LOGICAL_WITH_EXCLUDE/ABS_EXPORT_FORM.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SECONDARY_ID/SECONDARY_ID.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SECONDARY_ID/SECONDARY_ID.test.json
index 300b7cf3aa..e86078a7c3 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SECONDARY_ID/SECONDARY_ID.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SECONDARY_ID/SECONDARY_ID.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM.test.json
index 2fc9c4215b..db147087c0 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json
index 4eb14c811f..5c397a71e3 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/ENTITY_DATE/SIMPLE/ABS_EXPORT_FORM_WITH_SELECT.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SECONDARY_ID/SECONDARY_ID.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SECONDARY_ID/SECONDARY_ID.test.json
index 06385a0387..686a84976b 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SECONDARY_ID/SECONDARY_ID.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SECONDARY_ID/SECONDARY_ID.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SIMPLE/REL_EXPORT_FORM.test.json b/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SIMPLE/REL_EXPORT_FORM.test.json
index b9cc2becb4..3f5232e157 100644
--- a/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SIMPLE/REL_EXPORT_FORM.test.json
+++ b/backend/src/test/resources/tests/form/EXPORT_FORM/RELATIVE/SIMPLE/REL_EXPORT_FORM.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/FULL_EXPORT_FORM_SECONDARY_ID.test.json b/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/FULL_EXPORT_FORM_SECONDARY_ID.test.json
index 475001960d..bc4dbdb6a9 100644
--- a/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/FULL_EXPORT_FORM_SECONDARY_ID.test.json
+++ b/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/FULL_EXPORT_FORM_SECONDARY_ID.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": {
diff --git a/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/expected.csv b/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/expected.csv
index 79b5256401..9d79ba8a7d 100644
--- a/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/expected.csv
+++ b/backend/src/test/resources/tests/form/FULL_EXPORT_FORM/expected.csv
@@ -1,8 +1,8 @@
-result,dates,source,secondary,table column,vers_stamm date,vers_stamm date_end,vers_stamm geburtsdatum,vers_stamm geschlecht
-1,{2012-03-01/2012-03-01},table,1,A,,,,
-1,{2012-03-02/2012-03-02},table,1,A,,,,
-1,{2012-03-04/2012-03-04},table,2,A,,,,
-1,{2012-03-02/2012-03-02},table,1,B,,,,
-1,{2012-03-04/2012-03-04},table,2,B,,,,
-1,{2012-03-06/2012-03-06},table,3,B,,,,
-1,{2012-01-01/2012-01-01},vers_stamm,,,2012-01-01/2012-12-31,2012-12-31,1957-01-01,1
\ No newline at end of file
+result,dates,source,secondary,table column,vers_stamm date_end,vers_stamm geburtsdatum,vers_stamm geschlecht
+1,{2012-03-01/2012-03-01},table,1,A,,,
+1,{2012-03-02/2012-03-02},table,1,A,,,
+1,{2012-03-04/2012-03-04},table,2,A,,,
+1,{2012-03-02/2012-03-02},table,1,B,,,
+1,{2012-03-04/2012-03-04},table,2,B,,,
+1,{2012-03-06/2012-03-06},table,3,B,,,
+1,{2012-01-01/2012-01-01},vers_stamm,,,2012-12-31,1957-01-01,1
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/form/shared/alter.concept.json b/backend/src/test/resources/tests/form/shared/alter.concept.json
index d348668d07..3fed71af99 100644
--- a/backend/src/test/resources/tests/form/shared/alter.concept.json
+++ b/backend/src/test/resources/tests/form/shared/alter.concept.json
@@ -1,53 +1,56 @@
{
- "type": "TREE",
+ "type": "TREE",
+ "name": "alter",
+ "label": "Alter",
+ "hidden": false,
+ "connectors": {
"name": "alter",
"label": "Alter",
- "hidden": false,
- "connectors": {
- "name": "alter",
+ "validityDates": [
+ {
+ "name": "versichertenzeit",
+ "label": "Versichertenzeit",
+ "startColumn": "vers_stamm.date_start",
+ "endColumn": "vers_stamm.date_end"
+ },
+ {
+ "name": "erster_tag",
+ "label": "Erster Tag",
+ "column": "vers_stamm.date_start"
+ },
+ {
+ "name": "letzter_tag",
+ "label": "Letzter Tag",
+ "column": "vers_stamm.date_end"
+ }
+ ],
+ "table": "vers_stamm",
+ "filters": [
+ {
+ "type": "DATE_DISTANCE",
+ "name": "alterseinschränkung",
+ "label": "Alterseinschränkung",
+ "description": "Alter zur gegebenen Datumseinschränkung",
+ "column": "vers_stamm.geburtsdatum",
+ "timeUnit": "YEARS"
+ }
+ ],
+ "selects": [
+ {
+ "type": "DATE_DISTANCE",
+ "name": "alter_select",
"label": "Alter",
- "validityDates": [
- {
- "name": "versichertenzeit",
- "label": "Versichertenzeit",
- "column": "vers_stamm.date"
- },
- {
- "name": "erster_tag",
- "label": "Erster Tag",
- "column": "vers_stamm.date_start"
- },
- {
- "name": "letzter_tag",
- "label": "Letzter Tag",
- "column": "vers_stamm.date_end"
- }
- ],
- "table": "vers_stamm",
- "filters": {
- "type": "DATE_DISTANCE",
- "name": "alterseinschränkung",
- "label": "Alterseinschränkung",
- "description": "Alter zur gegebenen Datumseinschränkung",
- "column": "vers_stamm.geburtsdatum",
- "timeUnit": "YEARS"
- },
- "selects": [
- {
- "type": "DATE_DISTANCE",
- "name": "alter_select",
- "label": "Alter",
- "description": "Automatisch erzeugter Zusatzwert.",
- "column": "vers_stamm.geburtsdatum",
- "timeUnit": "YEARS",
- "default": true
- },
- {
- "name": "liste_geburtsdatum",
- "label": "Geburtsdatum",
- "type": "FIRST",
- "column": "vers_stamm.geburtsdatum"
- }
- ]
- }
+ "description": "Automatisch erzeugter Zusatzwert.",
+ "column": "vers_stamm.geburtsdatum",
+ "timeUnit": "YEARS",
+ "default": true
+ },
+ {
+ "name": "liste_geburtsdatum",
+ "label": "Geburtsdatum",
+ "type": "FIRST",
+ "column": "vers_stamm.geburtsdatum"
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/form/shared/geschlecht.concept.json b/backend/src/test/resources/tests/form/shared/geschlecht.concept.json
index bb423ad471..87fbf53aec 100644
--- a/backend/src/test/resources/tests/form/shared/geschlecht.concept.json
+++ b/backend/src/test/resources/tests/form/shared/geschlecht.concept.json
@@ -1,48 +1,49 @@
{
- "type": "TREE",
- "name": "geschlecht",
- "label": "Geschlecht",
- "hidden": false,
- "connectors": {
- "name": "geschlecht",
- "label": "Geschlecht",
- "validityDates": [
- {
- "name": "versichertenzeit",
- "label": "Versichertenzeit",
- "column": "vers_stamm.date"
- },
- {
- "name": "erster_tag",
- "label": "Erster Tag",
- "column": "vers_stamm.date_start"
- },
- {
- "name": "letzter_tag",
- "label": "Letzter Tag",
- "column": "vers_stamm.date_end"
- }
- ],
- "table": "vers_stamm",
- "filters": {
- "type": "SELECT",
- "name": "geschlecht",
- "label": "Geschlecht",
- "column": "vers_stamm.geschlecht",
- "labels": {
- "1": "Weiblich",
- "2": "Männlich"
- }
- },
- "selects": [
- {
- "type": "FIRST",
- "column": "vers_stamm.geschlecht",
- "name": "geschlecht_select",
- "label": "Geschlecht",
- "description": "Automatisch erzeugter Zusatzwert.",
- "default": true
- }
- ]
- }
+ "type": "TREE",
+ "name": "geschlecht",
+ "label": "Geschlecht",
+ "hidden": false,
+ "connectors": {
+ "name": "geschlecht",
+ "label": "Geschlecht",
+ "validityDates": [
+ {
+ "name": "versichertenzeit",
+ "label": "Versichertenzeit",
+ "startColumn": "vers_stamm.date_start",
+ "endColumn": "vers_stamm.date_end"
+ },
+ {
+ "name": "erster_tag",
+ "label": "Erster Tag",
+ "column": "vers_stamm.date_start"
+ },
+ {
+ "name": "letzter_tag",
+ "label": "Letzter Tag",
+ "column": "vers_stamm.date_end"
+ }
+ ],
+ "table": "vers_stamm",
+ "filters": {
+ "type": "SELECT",
+ "name": "geschlecht",
+ "label": "Geschlecht",
+ "column": "vers_stamm.geschlecht",
+ "labels": {
+ "1": "Weiblich",
+ "2": "Männlich"
+ }
+ },
+ "selects": [
+ {
+ "type": "FIRST",
+ "column": "vers_stamm.geschlecht",
+ "name": "geschlecht_select",
+ "label": "Geschlecht",
+ "description": "Automatisch erzeugter Zusatzwert.",
+ "default": true
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/form/shared/two_connector.concept.json b/backend/src/test/resources/tests/form/shared/two_connector.concept.json
index 18049046f9..d6d698281f 100644
--- a/backend/src/test/resources/tests/form/shared/two_connector.concept.json
+++ b/backend/src/test/resources/tests/form/shared/two_connector.concept.json
@@ -1,57 +1,59 @@
{
- "type": "TREE",
- "name": "two_connector",
- "label": "two_connector",
- "hidden": false,
- "connectors": [
+ "type": "TREE",
+ "name": "two_connector",
+ "label": "two_connector",
+ "hidden": false,
+ "connectors": [
+ {
+ "name": "table1",
+ "label": "Table1",
+ "table": "vers_stamm",
+ "validityDates": {
+ "name": "versichertenzeit",
+ "label": "Versichertenzeit",
+ "startColumn": "vers_stamm.date_start",
+ "endColumn": "vers_stamm.date_end"
+ },
+ "selects": [
{
- "name": "table1",
- "label": "Table1",
- "table": "vers_stamm",
- "validityDates": {
- "name": "versichertenzeit",
- "label": "Versichertenzeit",
- "column": "vers_stamm.date"
- },
- "selects": [
- {
- "type": "DATE_DISTANCE",
- "name": "alter_select",
- "label": "Ausgabe Alter",
- "description": "Automatisch erzeugter Zusatzwert.",
- "column": "vers_stamm.geburtsdatum",
- "timeUnit": "YEARS",
- "default": true
- },
- {
- "name": "liste_geburtsdatum",
- "label": "Ausgabe Geburtsdatum",
- "type": "FIRST",
- "column": "vers_stamm.geburtsdatum"
- }
- ]
+ "type": "DATE_DISTANCE",
+ "name": "alter_select",
+ "label": "Ausgabe Alter",
+ "description": "Automatisch erzeugter Zusatzwert.",
+ "column": "vers_stamm.geburtsdatum",
+ "timeUnit": "YEARS",
+ "default": true
},
{
- "name": "table2",
- "label": "Table2",
- "table": "vers_stamm",
- "validityDates": {
- "name": "versichertenzeit",
- "label": "Versichertenzeit",
- "column": "vers_stamm.date"
- },
- "selects": {
- "name": "liste_geburtsdatum",
- "label": "Ausgabe Geburtsdatum",
- "type": "FIRST",
- "column": "vers_stamm.geburtsdatum",
- "default": true
- }
+ "name": "liste_geburtsdatum",
+ "label": "Ausgabe Geburtsdatum",
+ "type": "FIRST",
+ "column": "vers_stamm.geburtsdatum"
}
- ],
- "selects": {
- "name": "exists",
- "type": "EXISTS",
+ ]
+ },
+ {
+ "name": "table2",
+ "label": "Table2",
+ "table": "vers_stamm",
+ "validityDates": {
+ "name": "versichertenzeit",
+ "label": "Versichertenzeit",
+ "startColumn": "vers_stamm.date_start",
+ "endColumn": "vers_stamm.date_end"
+ },
+ "selects": {
+ "name": "liste_geburtsdatum",
+ "label": "Ausgabe Geburtsdatum",
+ "type": "FIRST",
+ "column": "vers_stamm.geburtsdatum",
"default": true
+ }
}
+ ],
+ "selects": {
+ "name": "exists",
+ "type": "EXISTS",
+ "default": true
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/form/shared/vers_stamm.table.json b/backend/src/test/resources/tests/form/shared/vers_stamm.table.json
index 4103317a65..e859b18208 100644
--- a/backend/src/test/resources/tests/form/shared/vers_stamm.table.json
+++ b/backend/src/test/resources/tests/form/shared/vers_stamm.table.json
@@ -6,10 +6,6 @@
"type": "STRING"
},
"columns": [
- {
- "name" : "date",
- "type" : "DATE_RANGE"
- },
{
"name" : "date_start",
"type" : "DATE"
diff --git a/backend/src/test/resources/tests/form/shared/vers_tage_range.table.json b/backend/src/test/resources/tests/form/shared/vers_tage_range.table.json
index 531141e86a..54e6112e0c 100644
--- a/backend/src/test/resources/tests/form/shared/vers_tage_range.table.json
+++ b/backend/src/test/resources/tests/form/shared/vers_tage_range.table.json
@@ -6,10 +6,6 @@
"type" : "STRING"
},
"columns" : [
- {
- "name" : "date",
- "type" : "DATE_RANGE"
- },
{
"name" : "date_start",
"type" : "DATE"
diff --git a/backend/src/test/resources/tests/form/shared/versicherten_tage.table.json b/backend/src/test/resources/tests/form/shared/versicherten_tage.table.json
index b2148702d7..30739d5a9b 100644
--- a/backend/src/test/resources/tests/form/shared/versicherten_tage.table.json
+++ b/backend/src/test/resources/tests/form/shared/versicherten_tage.table.json
@@ -1,14 +1,18 @@
{
- "csv": "tests/form/shared/versicherten_tage.csv",
- "name": "vers_tage_range",
- "primaryColumn": {
- "name": "pid",
- "type": "STRING"
+ "csv": "tests/form/shared/versicherten_tage.csv",
+ "name": "vers_tage_range",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "date_start",
+ "type": "DATE"
},
- "columns": [
- {
- "name": "date",
- "type": "DATE_RANGE"
- }
- ]
+ {
+ "name": "date_end",
+ "type": "DATE"
+ }
+ ]
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/form/shared/versichertentage.concept.json b/backend/src/test/resources/tests/form/shared/versichertentage.concept.json
index 57024afb37..5be0688ec5 100644
--- a/backend/src/test/resources/tests/form/shared/versichertentage.concept.json
+++ b/backend/src/test/resources/tests/form/shared/versichertentage.concept.json
@@ -1,48 +1,52 @@
{
- "type": "TREE",
- "name": "versichertentage",
- "label": "Versichertentage",
- "hidden": false,
- "connectors": [
- {
- "name": "versichertentage",
- "label": "Versichertentage",
- "validityDates": [
- {
- "name": "datum",
- "label": "Datum",
- "column": "vers_tage_range.date"
- }
- ],
- "selects": [
- {
- "type": "DATE_UNION",
- "column": "vers_tage_range.date",
- "name": "versichertentage_periods",
- "label": "Ausgabe Versichertenzeiträume",
- "description": "Gibt die Versichertentage als Zeiträume aus."
- },
- {
- "type": "DURATION_SUM",
- "column": "vers_tage_range.date",
- "name": "versichertentage_select",
- "label": "Ausgabe Versichertentage",
- "description": "Automatisch erzeugter Zusatzwert.",
- "default": true
- }
- ],
- "filters": [
- {
- "type": "DURATION_SUM",
- "name": "versichertentage",
- "label": "Versichertentage",
- "unit": "Tage",
- "description": "Versichertentage",
- "column": "vers_tage_range.date"
- }
- ],
- "table": "vers_tage_range"
- }
- ]
- }
+ "type": "TREE",
+ "name": "versichertentage",
+ "label": "Versichertentage",
+ "hidden": false,
+ "connectors": [
+ {
+ "name": "versichertentage",
+ "label": "Versichertentage",
+ "validityDates": [
+ {
+ "name": "datum",
+ "label": "Datum",
+ "startColumn": "vers_tage_range.date_start",
+ "endColumn": "vers_tage_range.date_end"
+ }
+ ],
+ "selects": [
+ {
+ "type": "DATE_UNION",
+ "startColumn": "vers_tage_range.date_start",
+ "endColumn": "vers_tage_range.date_end",
+ "name": "versichertentage_periods",
+ "label": "Ausgabe Versichertenzeiträume",
+ "description": "Gibt die Versichertentage als Zeiträume aus."
+ },
+ {
+ "type": "DURATION_SUM",
+ "startColumn": "vers_tage_range.date_start",
+ "endColumn": "vers_tage_range.date_end",
+ "name": "versichertentage_select",
+ "label": "Ausgabe Versichertentage",
+ "description": "Automatisch erzeugter Zusatzwert.",
+ "default": true
+ }
+ ],
+ "filters": [
+ {
+ "type": "DURATION_SUM",
+ "name": "versichertentage",
+ "label": "Versichertentage",
+ "unit": "Tage",
+ "description": "Versichertentage",
+ "startColumn": "vers_tage_range.date_start",
+ "endColumn": "vers_tage_range.date_end"
+ }
+ ],
+ "table": "vers_tage_range"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/ABS_EXPORT/ABS_EXPORT_Query.test.json b/backend/src/test/resources/tests/query/ABS_EXPORT/ABS_EXPORT_Query.test.json
index 9646f65b66..4a35ead38e 100644
--- a/backend/src/test/resources/tests/query/ABS_EXPORT/ABS_EXPORT_Query.test.json
+++ b/backend/src/test/resources/tests/query/ABS_EXPORT/ABS_EXPORT_Query.test.json
@@ -2,6 +2,14 @@
"type": "QUERY_TEST",
"label": "ABS_EXPORT Test",
"expectedCsv": "tests/query/ABS_EXPORT/expected.csv",
+ "sqlSpec": {
+ "isEnabled": true,
+ "comment": "Clickhouse does not have Lateral joins at the moment. But fix is hopefully coming.",
+ "supportedDialects": [
+ "POSTGRESQL",
+ "HANA"
+ ]
+ },
"query": {
"type": "ABSOLUTE_FORM_QUERY",
"dateRange": {
diff --git a/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/CONCEPT_RESTRICTION.test.json b/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/CONCEPT_RESTRICTION.test.json
index 77822fc2eb..8154bc43c1 100644
--- a/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/CONCEPT_RESTRICTION.test.json
+++ b/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/CONCEPT_RESTRICTION.test.json
@@ -1,38 +1,27 @@
{
"type": "QUERY_TEST",
"label": "CONCEPT_RESTRICTION Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/query/CONCEPT_DATE_RESTRICTION_OPEN/expected.csv",
"query": {
"type": "CONCEPT_QUERY",
"root": {
- "type": "AND",
- "children": [
- {
- "type": "DATE_RESTRICTION",
- "dateRange": {
- "min": "2018-01-01",
- "max": "2018-12-31"
- },
- "child": {
- "type": "CONCEPT",
- "ids": [
- "open_concept"
- ],
- "tables": [
- {
- "id": "open_concept.connector",
- "filters": []
- }
- ]
+ "type": "DATE_RESTRICTION",
+ "dateRange": {
+ "min": "2018-01-01",
+ "max": "2018-12-31"
+ },
+ "child": {
+ "type": "CONCEPT",
+ "ids": [
+ "open_concept"
+ ],
+ "tables": [
+ {
+ "id": "open_concept.connector",
+ "filters": []
}
- }
- ]
+ ]
+ }
}
},
"concepts": [
@@ -46,7 +35,8 @@
"validityDates": [
{
"name": "date",
- "column": "open_table.open_date"
+ "startColumn": "open_table.start",
+ "endColumn": "open_table.end"
}
],
"filters": []
@@ -67,11 +57,15 @@
},
"columns": [
{
- "name": "open_date",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
]
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/content.csv b/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/content.csv
index cf03375d91..135f7ef10c 100644
--- a/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/content.csv
+++ b/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_OPEN/content.csv
@@ -1,8 +1,8 @@
-pid,open_date
-1,2017-01-01/
-2,2017-01-01/2019-12-31
-3,/2019-12-31
-4,2018-01-01/2018-01-01
-5,2018-04-01/2019-08-31
-6,2019-01-01/2019-12-31
-7,2017-01-01/2017-12-31
+pid,start,end
+1,2017-01-01,
+2,2017-01-01,2019-12-31
+3,,2019-12-31
+4,2018-01-01,2018-01-01
+5,2018-04-01,2019-08-31
+6,2019-01-01,2019-12-31
+7,2017-01-01,2017-12-31
diff --git a/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE.test.json b/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE.test.json
index c2fb4becfe..7e35a0792c 100644
--- a/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE.test.json
+++ b/backend/src/test/resources/tests/query/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/CONCEPT_DATE_RESTRICTION_WITHOUT_VALIDITYDATE/expected.csv",
diff --git a/backend/src/test/resources/tests/query/CONCEPT_RESTRICTION_QUERY/CONCEPT_RESTRICTION.test.json b/backend/src/test/resources/tests/query/CONCEPT_RESTRICTION_QUERY/CONCEPT_RESTRICTION.test.json
index ad63360ba1..f2f40d1001 100644
--- a/backend/src/test/resources/tests/query/CONCEPT_RESTRICTION_QUERY/CONCEPT_RESTRICTION.test.json
+++ b/backend/src/test/resources/tests/query/CONCEPT_RESTRICTION_QUERY/CONCEPT_RESTRICTION.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/CONCEPT_RESTRICTION_QUERY/expected-kh.csv",
diff --git a/backend/src/test/resources/tests/query/CONCEPT_WITHOUT_VALIDITYDATE/CONCEPT_WITHOUT_VALIDITYDATE.test.json b/backend/src/test/resources/tests/query/CONCEPT_WITHOUT_VALIDITYDATE/CONCEPT_WITHOUT_VALIDITYDATE.test.json
index 117e0fb4fd..a15451aff3 100644
--- a/backend/src/test/resources/tests/query/CONCEPT_WITHOUT_VALIDITYDATE/CONCEPT_WITHOUT_VALIDITYDATE.test.json
+++ b/backend/src/test/resources/tests/query/CONCEPT_WITHOUT_VALIDITYDATE/CONCEPT_WITHOUT_VALIDITYDATE.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/CONCEPT_WITHOUT_VALIDITYDATE/expected.csv",
diff --git a/backend/src/test/resources/tests/query/CQEXTERNAL_EXTRA_DATA/SIMPLE_CQEXTERNAL_QUERY.test.json b/backend/src/test/resources/tests/query/CQEXTERNAL_EXTRA_DATA/SIMPLE_CQEXTERNAL_QUERY.test.json
index 95e681e27d..f4e2de3a3c 100644
--- a/backend/src/test/resources/tests/query/CQEXTERNAL_EXTRA_DATA/SIMPLE_CQEXTERNAL_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/CQEXTERNAL_EXTRA_DATA/SIMPLE_CQEXTERNAL_QUERY.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/CQEXTERNAL_EXTRA_DATA/expected.csv",
diff --git a/backend/src/test/resources/tests/query/CQYES/CQYES.test.json b/backend/src/test/resources/tests/query/CQYES/CQYES.test.json
index 95f56918e8..7448d352b4 100644
--- a/backend/src/test/resources/tests/query/CQYES/CQYES.test.json
+++ b/backend/src/test/resources/tests/query/CQYES/CQYES.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/CQYES/expected.csv",
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE.test.json
index 3438b18284..9c3e898625 100644
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE.test.json
+++ b/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE.test.json
@@ -16,36 +16,31 @@
"min": "2011-01-01",
"max": "2011-01-01"
},
- "child": {
- "type": "OR",
- "children": [
+ "child":{
+ "type": "CONCEPT",
+ "ids": [
+ "alter"
+ ],
+ "label": "Alter",
+ "excludeFromTimeAggregation": false,
+ "tables": [
{
- "type": "CONCEPT",
- "ids": [
- "alter"
+ "id": "alter.alterxy",
+ "selects": [
],
- "label": "Alter",
- "excludeFromTimeAggregation": false,
- "tables": [
+ "filters": [
{
- "id": "alter.alterxy",
- "selects": [
- ],
- "filters": [
- {
- "filter": "alter.alterxy.alterseinschrankung",
- "type": "INTEGER_RANGE",
- "value": {
- "min": "11",
- "max": "11"
- }
- }
- ]
+ "filter": "alter.alterxy.alterseinschrankung",
+ "type": "INTEGER_RANGE",
+ "value": {
+ "min": "11",
+ "max": "11"
+ }
}
- ],
- "selects": [
]
}
+ ],
+ "selects": [
]
}
}
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_ERSTER.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_ERSTER.test.json
index f27cdad5bc..a935f681a2 100644
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_ERSTER.test.json
+++ b/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_ERSTER.test.json
@@ -1,10 +1,11 @@
{
"type": "QUERY_TEST",
"label": "DATE_DISTANCE_ERSTER Test",
- "sqlSpec": {
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "HANA"
]
},
"expectedCsv": "tests/query/DATE_DISTANCE/expected-erster.csv",
@@ -23,10 +24,10 @@
],
"tables": [
{
- "id": "alter.alterxy",
+ "id": "alter.connector",
"filters": [
{
- "filter": "alter.alterxy.alterseinschrankung",
+ "filter": "alter.connector.alterseinschrankung",
"type": "INTEGER_RANGE",
"value": {
"min": "11",
@@ -43,19 +44,18 @@
},
"concepts": [
{
- "label": "alter",
+ "name": "alter",
"type": "TREE",
"connectors": [
{
- "label": "alterxy",
+ "name" : "connector",
"table": "table1",
"validityDates": {
- "label": "erster",
+ "name": "erster",
"column": "table1.erster"
},
"filters": {
- "label": "alterseinschrankung",
- "description": "Geburtsdatum",
+ "name": "alterseinschrankung",
"column": "table1.geburtsdatum",
"type": "DATE_DISTANCE"
}
@@ -80,14 +80,6 @@
{
"name": "erster",
"type": "DATE"
- },
- {
- "name": "letzter",
- "type": "DATE"
- },
- {
- "name": "versichertenzeit",
- "type": "DATE_RANGE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_LETZTER.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_LETZTER.test.json
deleted file mode 100644
index 0456915a86..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE/DATE_DISTANCE_LETZTER.test.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"DATE_DISTANCE_LETZTER Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/DATE_DISTANCE/expected-letzter.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2011-12-31",
- "max":"2011-12-31"
- },
- "child":{
- "type":"OR",
- "children":[
- {
- "type":"CONCEPT",
- "ids":[
- "alter"
- ],
- "label":"Alter",
- "excludeFromTimeAggregation":false,
- "tables":[
- {
- "id":"alter.alterxy",
- "selects":[
-
- ],
- "filters":[
- {
- "filter":"alter.alterxy.alterseinschrankung",
- "type":"INTEGER_RANGE",
- "value":{
- "min":"11",
- "max":"11"
- }
- }
- ]
- }
- ],
- "selects":[
-
- ]
- }
- ]
- }
- }
- },
- "concepts":[
- {
- "label":"alter",
- "type":"TREE",
- "connectors":[
- {
- "label":"alterxy",
- "table":"table1",
- "validityDates":{
- "label":"letzter",
- "column":"table1.letzter"
- },
- "filters":{
- "label":"alterseinschrankung",
- "description":"Geburtsdatum",
- "column":"table1.geburtsdatum",
- "type":"DATE_DISTANCE"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DATE_DISTANCE/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"geburtsdatum",
- "type":"DATE"
- },
- {
- "name":"erster",
- "type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE/expected-letzter.csv b/backend/src/test/resources/tests/query/DATE_DISTANCE/expected-letzter.csv
deleted file mode 100644
index fe8c86fc3f..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE/expected-letzter.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-result,dates
-3,{2011-12-31/2011-12-31}
-5,{2011-12-31/2011-12-31}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE.test.json
deleted file mode 100644
index f325fe9be7..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE.test.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"DATE_DISTANCE_AGE_SPAN_VERSICHERTENZEIT Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/DATE_DISTANCE_AGE_SPAN/expected-versichertenzeit.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2011-01-01",
- "max":"2011-01-01"
- },
- "child":{
- "type":"OR",
- "children":[
- {
- "type":"CONCEPT",
- "ids":[
- "alter"
- ],
- "label":"Alter",
- "excludeFromTimeAggregation":false,
- "tables":[
- {
- "id":"alter.alterxy",
- "selects":[
-
- ],
- "filters":[
- {
- "filter":"alter.alterxy.alterseinschrankung",
- "type":"INTEGER_RANGE",
- "value":{
- "min":"11",
- "max":"12"
- }
- }
- ]
- }
- ],
- "selects":[
-
- ]
- }
- ]
- }
- }
- },
- "concepts":[
- {
- "label":"alter",
- "type":"TREE",
- "connectors":[
- {
- "label":"alterxy",
- "table":"table1",
- "validityDates":{
- "label":"versichertenzeit",
- "column":"table1.versichertenzeit"
- },
- "filters":{
- "label":"alterseinschrankung",
- "description":"Geburtsdatum",
- "column":"table1.geburtsdatum",
- "type":"DATE_DISTANCE"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DATE_DISTANCE_AGE_SPAN/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"geburtsdatum",
- "type":"DATE"
- },
- {
- "name":"erster",
- "type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE_ERSTER.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE_ERSTER.test.json
deleted file mode 100644
index 510b426a83..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE_ERSTER.test.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"DATE_DISTANCE_AGE_SPAN_ERSTER Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/DATE_DISTANCE_AGE_SPAN/expected-erster.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2011-01-01",
- "max":"2011-01-01"
- },
- "child":{
- "type":"OR",
- "children":[
- {
- "type":"CONCEPT",
- "ids":[
- "alter"
- ],
- "label":"Alter",
- "excludeFromTimeAggregation":false,
- "tables":[
- {
- "id":"alter.alterxy",
- "selects":[
-
- ],
- "filters":[
- {
- "filter":"alter.alterxy.alterseinschrankung",
- "type":"INTEGER_RANGE",
- "value":{
- "min":"11",
- "max":"12"
- }
- }
- ]
- }
- ],
- "selects":[
-
- ]
- }
- ]
- }
- }
- },
- "concepts":[
- {
- "label":"alter",
- "type":"TREE",
- "connectors":[
- {
- "label":"alterxy",
- "table":"table1",
- "validityDates":{
- "label":"erster",
- "column":"table1.erster"
- },
- "filters":{
- "label":"alterseinschrankung",
- "description":"Geburtsdatum",
- "column":"table1.geburtsdatum",
- "type":"DATE_DISTANCE"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DATE_DISTANCE_AGE_SPAN/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"geburtsdatum",
- "type":"DATE"
- },
- {
- "name":"erster",
- "type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE_LETZTER.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE_LETZTER.test.json
deleted file mode 100644
index feb6852c47..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/DATE_DISTANCE_LETZTER.test.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"DATE_DISTANCE_AGE_SPAN_LETZTER Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/DATE_DISTANCE_AGE_SPAN/expected-letzter.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2011-12-31",
- "max":"2011-12-31"
- },
- "child":{
- "type":"OR",
- "children":[
- {
- "type":"CONCEPT",
- "ids":[
- "alter"
- ],
- "label":"Alter",
- "excludeFromTimeAggregation":false,
- "tables":[
- {
- "id":"alter.alterxy",
- "selects":[
-
- ],
- "filters":[
- {
- "filter":"alter.alterxy.alterseinschrankung",
- "type":"INTEGER_RANGE",
- "value":{
- "min":"11",
- "max":"12"
- }
- }
- ]
- }
- ],
- "selects":[
-
- ]
- }
- ]
- }
- }
- },
- "concepts":[
- {
- "label":"alter",
- "type":"TREE",
- "connectors":[
- {
- "label":"alterxy",
- "table":"table1",
- "validityDates":{
- "label":"letzter",
- "column":"table1.letzter"
- },
- "filters":{
- "label":"alterseinschrankung",
- "description":"Geburtsdatum",
- "column":"table1.geburtsdatum",
- "type":"DATE_DISTANCE"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DATE_DISTANCE_AGE_SPAN/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"geburtsdatum",
- "type":"DATE"
- },
- {
- "name":"erster",
- "type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/content.csv b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/content.csv
deleted file mode 100644
index ecff818b5b..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/content.csv
+++ /dev/null
@@ -1,27 +0,0 @@
-pid,geburtsdatum,erster,letzter,versichertenzeit
-1,"2000-01-01","2010-01-01","2013-12-31","2010-01-01/2013-12-31"
-2,"2000-01-01","2011-01-01","2013-12-31","2011-01-01/2013-12-31"
-3,"2000-01-01","2010-01-01","2011-12-31","2010-01-01/2011-12-31"
-4,"2000-01-01","2010-01-01","2010-12-31","2010-01-01/2010-12-31"
-4,"2000-01-01","2012-01-01","2013-12-31","2012-01-01/2013-12-31"
-5,"2000-01-01","2011-01-01","2011-12-31","2011-01-01/2011-12-31"
-21,"2001-01-01","2010-01-01","2013-12-31","2010-01-01/2013-12-31"
-22,"2001-01-01","2011-01-01","2013-12-31","2011-01-01/2013-12-31"
-23,"2001-01-01","2010-01-01","2011-12-31","2010-01-01/2011-12-31"
-24,"2001-01-01","2010-01-01","2010-12-31","2010-01-01/2010-12-31"
-24,"2001-01-01","2012-01-01","2013-12-31","2012-01-01/2013-12-31"
-25,"2001-01-01","2011-01-01","2011-12-31","2011-01-01/2011-12-31"
-31,"1999-01-01","2010-01-01","2013-12-31","2010-01-01/2013-12-31"
-32,"1999-01-01","2011-01-01","2013-12-31","2011-01-01/2013-12-31"
-33,"1999-01-01","2010-01-01","2011-12-31","2010-01-01/2011-12-31"
-34,"1999-01-01","2010-01-01","2010-12-31","2010-01-01/2010-12-31"
-34,"1999-01-01","2012-01-01","2013-12-31","2012-01-01/2013-12-31"
-35,"1999-01-01","2011-01-01","2011-12-31","2011-01-01/2011-12-31"
-41,,"2012-01-01","2013-12-31","2012-01-01/2013-12-31"
-42,,"2011-01-01","2013-12-31","2011-01-01/2013-12-31"
-43,,"2010-01-01","2011-12-31","2010-01-01/2011-12-31"
-44,,"2010-01-01","2010-12-31","2010-01-01/2010-12-31"
-44,,"2012-01-01","2013-12-31","2012-01-01/2013-12-31"
-45,,"2011-01-01","2011-12-31","2011-01-01/2011-12-31"
-51,"2000-01-01",,,
-61,,,,
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-erster.csv b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-erster.csv
deleted file mode 100644
index 47be0a629d..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-erster.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-result,dates
-2,{2011-01-01/2011-01-01}
-5,{2011-01-01/2011-01-01}
-32,{2011-01-01/2011-01-01}
-35,{2011-01-01/2011-01-01}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-letzter.csv b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-letzter.csv
deleted file mode 100644
index dc8899feb3..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-letzter.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-result,dates
-3,{2011-12-31/2011-12-31}
-5,{2011-12-31/2011-12-31}
-33,{2011-12-31/2011-12-31}
-35,{2011-12-31/2011-12-31}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-versichertenzeit.csv b/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-versichertenzeit.csv
deleted file mode 100644
index 2401164da9..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_AGE_SPAN/expected-versichertenzeit.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-result,dates
-1,{2011-01-01/2011-01-01}
-2,{2011-01-01/2011-01-01}
-3,{2011-01-01/2011-01-01}
-5,{2011-01-01/2011-01-01}
-31,{2011-01-01/2011-01-01}
-32,{2011-01-01/2011-01-01}
-33,{2011-01-01/2011-01-01}
-35,{2011-01-01/2011-01-01}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE.test.json
index 671114bcf1..5ab4385394 100644
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE.test.json
+++ b/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE.test.json
@@ -1,110 +1,106 @@
-{
- "type":"QUERY_TEST",
- "label":"DATE_DISTANCE_NEGATION_VERSICHERTENZEIT Test",
- "sqlSpec": {
+{
+ "type": "QUERY_TEST",
+ "label": "DATE_DISTANCE_NEGATION_VERSICHERTENZEIT Test",
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "HANA"
]
},
- "expectedCsv":"tests/query/DATE_DISTANCE_NEGATION/expected-versichertenzeit.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"NEGATION",
- "child":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2011-01-01",
- "max":"2011-01-01"
- },
- "child":{
- "type":"OR",
- "children":[
- {
- "type":"CONCEPT",
- "ids":[
- "alter"
- ],
- "label":"Alter",
- "excludeFromTimeAggregation":false,
- "tables":[
- {
- "id":"alter.alterxy",
- "selects":[
-
- ],
- "filters":[
- {
- "filter":"alter.alterxy.alterseinschrankung",
- "type":"INTEGER_RANGE",
- "value":{
- "min":"11",
- "max":"11"
- }
- }
- ]
- }
- ],
- "selects":[
-
- ]
- }
- ]
+ "expectedCsv": "tests/query/DATE_DISTANCE_NEGATION/expected-versichertenzeit.csv",
+ "query": {
+ "type": "CONCEPT_QUERY",
+ "root": {
+ "type": "NEGATION",
+ "child": {
+ "type": "DATE_RESTRICTION",
+ "dateRange": {
+ "min": "2011-01-01",
+ "max": "2011-01-01"
+ },
+ "child": {
+ "type": "OR",
+ "children": [
+ {
+ "type": "CONCEPT",
+ "ids": [
+ "alter"
+ ],
+ "label": "Alter",
+ "excludeFromTimeAggregation": false,
+ "tables": [
+ {
+ "id": "alter.alterxy",
+ "selects": [
+ ],
+ "filters": [
+ {
+ "filter": "alter.alterxy.alterseinschrankung",
+ "type": "INTEGER_RANGE",
+ "value": {
+ "min": "11",
+ "max": "11"
+ }
+ }
+ ]
+ }
+ ],
+ "selects": [
+ ]
}
- }
+ ]
+ }
}
- },
- "concepts":[
- {
- "label":"alter",
- "type":"TREE",
- "connectors":[
- {
- "label":"alterxy",
- "table":"table1",
- "validityDates":{
- "label":"versichertenzeit",
- "column":"table1.versichertenzeit"
- },
- "filters":{
- "label":"alterseinschrankung",
- "description":"Geburtsdatum",
- "column":"table1.geburtsdatum",
- "type":"DATE_DISTANCE"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DATE_DISTANCE_NEGATION/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"geburtsdatum",
- "type":"DATE"
- },
- {
- "name":"erster",
- "type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
- }
- ]
- }
+ }
+ },
+ "concepts": [
+ {
+ "label": "alter",
+ "type": "TREE",
+ "connectors": [
+ {
+ "label": "alterxy",
+ "table": "table1",
+ "validityDates": {
+ "label": "versichertenzeit",
+ "startColumn": "table1.erster",
+ "endColumn": "table1.letzter"
+ },
+ "filters": {
+ "label": "alterseinschrankung",
+ "description": "Geburtsdatum",
+ "column": "table1.geburtsdatum",
+ "type": "DATE_DISTANCE"
+ }
+ }
]
- }
+ }
+ ],
+ "content": {
+ "tables": [
+ {
+ "csv": "tests/query/DATE_DISTANCE_NEGATION/content.csv",
+ "name": "table1",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "geburtsdatum",
+ "type": "DATE"
+ },
+ {
+ "name": "erster",
+ "type": "DATE"
+ },
+ {
+ "name": "letzter",
+ "type": "DATE"
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_ERSTER.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_ERSTER.test.json
index 855850c88c..f1b1b27360 100644
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_ERSTER.test.json
+++ b/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_ERSTER.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv":"tests/query/DATE_DISTANCE_NEGATION/expected-erster.csv",
@@ -94,14 +94,6 @@
{
"name":"erster",
"type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_LETZTER.test.json b/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_LETZTER.test.json
deleted file mode 100644
index 51b3b1c279..0000000000
--- a/backend/src/test/resources/tests/query/DATE_DISTANCE_NEGATION/DATE_DISTANCE_LETZTER.test.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"DATE_DISTANCE_NEGATION_LETZTER Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/DATE_DISTANCE_NEGATION/expected-letzter.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"NEGATION",
- "child":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2011-12-31",
- "max":"2011-12-31"
- },
- "child":{
- "type":"OR",
- "children":[
- {
- "type":"CONCEPT",
- "ids":[
- "alter"
- ],
- "label":"Alter",
- "excludeFromTimeAggregation":false,
- "tables":[
- {
- "id":"alter.alterxy",
- "selects":[
-
- ],
- "filters":[
- {
- "filter":"alter.alterxy.alterseinschrankung",
- "type":"INTEGER_RANGE",
- "value":{
- "min":"11",
- "max":"11"
- }
- }
- ]
- }
- ],
- "selects":[
-
- ]
- }
- ]
- }
- }
- }
- },
- "concepts":[
- {
- "label":"alter",
- "type":"TREE",
- "connectors":[
- {
- "label":"alterxy",
- "table":"table1",
- "validityDates":{
- "label":"letzter",
- "column":"table1.letzter"
- },
- "filters":{
- "label":"alterseinschrankung",
- "description":"Geburtsdatum",
- "column":"table1.geburtsdatum",
- "type":"DATE_DISTANCE"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DATE_DISTANCE_NEGATION/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"geburtsdatum",
- "type":"DATE"
- },
- {
- "name":"erster",
- "type":"DATE"
- },
- {
- "name":"letzter",
- "type":"DATE"
- },
- {
- "name":"versichertenzeit",
- "type":"DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY.test.json b/backend/src/test/resources/tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY.test.json
index 63de4ea517..6aed04d9e1 100644
--- a/backend/src/test/resources/tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY.test.json
@@ -1,90 +1,81 @@
-{
- "type":"QUERY_TEST",
- "label":"DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/expected-zeitspanne.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root":{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2010-01-01",
- "max":"2010-01-31"
- },
- "child":{
- "type":"CONCEPT",
- "ids":[
- "kg_tage_duration_sum"
- ],
- "label":"KG-Tage DURATION_SUM",
- "tables":[
- {
- "id":"kg_tage_duration_sum.kg_tage_connector",
- "filters":[
- {
- "filter":"kg_tage_duration_sum.kg_tage_connector.datum",
- "type":"INTEGER_RANGE",
- "value":{
- "min":0
- }
- }
- ]
- }
+{
+ "type": "QUERY_TEST",
+ "label": "DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY Test",
+ "expectedCsv": "tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/expected-zeitspanne.csv",
+ "query": {
+ "type": "CONCEPT_QUERY",
+ "root": {
+ "type": "DATE_RESTRICTION",
+ "dateRange": {
+ "min": "2010-01-01",
+ "max": "2010-01-31"
+ },
+ "child": {
+ "type": "CONCEPT",
+ "ids": [
+ "kg_tage_duration_sum"
+ ],
+ "label": "KG-Tage DURATION_SUM",
+ "tables": [
+ {
+ "id": "kg_tage_duration_sum.kg_tage_connector",
+ "filters": [
+ {
+ "filter": "kg_tage_duration_sum.kg_tage_connector.datum",
+ "type": "INTEGER_RANGE",
+ "value": {
+ "min": 0
+ }
+ }
]
- }
+ }
+ ]
}
- },
- "concepts":[
- {
- "label":"kg_tage_duration_sum",
- "type":"TREE",
- "connectors":[
- {
- "label":"kg_tage_connector",
- "table":"table1",
- "validityDates":{
- "label":"datum",
- "column":"table1.datum"
- },
- "filters":{
- "label":"datum",
- "description":"Zeitraum, der im oben beschriebenen Zeitraum liegen soll",
- "column":"table1.datum",
- "type":"DURATION_SUM"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns":[
- {
- "name":"anfang",
- "type":"DATE"
- },
- {
- "name":"ende",
- "type":"DATE"
- },
- {
- "name":"datum",
- "type":"DATE_RANGE"
- }
- ]
- }
+ }
+ },
+ "concepts": [
+ {
+ "label": "kg_tage_duration_sum",
+ "type": "TREE",
+ "connectors": [
+ {
+ "label": "kg_tage_connector",
+ "table": "table1",
+ "validityDates": {
+ "label": "datum",
+ "startColumn": "table1.anfang",
+ "endColumn": "table1.ende"
+ },
+ "filters": {
+ "label": "datum",
+ "startColumn": "table1.anfang",
+ "endColumn": "table1.ende",
+ "type": "DURATION_SUM"
+ }
+ }
]
- }
+ }
+ ],
+ "content": {
+ "tables": [
+ {
+ "csv": "tests/query/DURATION_SUM_EMPTY_DATE_CONCEPT_QUERY/content.csv",
+ "name": "table1",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "anfang",
+ "type": "DATE"
+ },
+ {
+ "name": "ende",
+ "type": "DATE"
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/EXTERNAL_NEGATION/SIMPLE_CQEXTERNAL_QUERY.test.json b/backend/src/test/resources/tests/query/EXTERNAL_NEGATION/SIMPLE_CQEXTERNAL_QUERY.test.json
index e4eee66e6f..64fa40fe7c 100644
--- a/backend/src/test/resources/tests/query/EXTERNAL_NEGATION/SIMPLE_CQEXTERNAL_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/EXTERNAL_NEGATION/SIMPLE_CQEXTERNAL_QUERY.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/EXTERNAL_NEGATION/expected.csv",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/AND_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
index ca584b9cca..987905abfc 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
@@ -2,9 +2,10 @@
"type": "QUERY_TEST",
"label": "AND DATE LOGIC Test",
"sqlSpec": {
- "isEnabled": true,
+ "comment" : "Logical will hopefully removed",
+ "isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/LOGICAL/AND_DATE_LOGICAL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/SIMPLE_TREECONCEPT_Query.test.json
index f211dc1e8f..b7114adddf 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM/SIMPLE_TREECONCEPT_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/LOGICAL/AND_DURATION_SUM/expected.csv",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/SIMPLE_TREECONCEPT_Query.test.json
index 8f9194ef73..8da38c9046 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/SIMPLE_TREECONCEPT_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/LOGICAL/AND_DURATION_SUM_MULTI_CONCEPT/expected.csv",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
index 5f604ea1d4..32d27dee69 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/LOGICAL/AND_NEGATION_DATE_LOGICAL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_RESTRICTION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_RESTRICTION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
index 8799fe23cc..73ed29e6fd 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_RESTRICTION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/AND_NEGATION_RESTRICTION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/LOGICAL/AND_NEGATION_RESTRICTION_DATE_LOGICAL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/NEGATION_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/NEGATION_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
index 330015c9b1..687ec4efd9 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/NEGATION_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/NEGATION_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
@@ -2,6 +2,14 @@
"type": "QUERY_TEST",
"label": "AND NEGATION DATE LOGIC Test",
"expectedCsv": "tests/query/LOGICAL/NEGATION_LOGICAL/expected.csv",
+ "sqlSpec": {
+ "isEnabled": true,
+ "comment": "Logical will hopefully be kicked.",
+ "supportedDialects": [
+ "POSTGRESQL",
+ "HANA"
+ ]
+ },
"query": {
"type": "CONCEPT_QUERY",
"dateAggregationMode": "LOGICAL",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/OR/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/OR/SIMPLE_TREECONCEPT_Query.test.json
index baf0352180..e306d957c6 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/OR/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/OR/SIMPLE_TREECONCEPT_Query.test.json
@@ -2,6 +2,14 @@
"type": "QUERY_TEST",
"label": "OR Test",
"expectedCsv": "tests/query/LOGICAL/OR/expected.csv",
+ "sqlSpec": {
+ "isEnabled": true,
+ "comment": "Logical will hopefully be kicked.",
+ "supportedDialects": [
+ "POSTGRESQL",
+ "HANA"
+ ]
+ },
"query": {
"type": "CONCEPT_QUERY",
"root": {
diff --git a/backend/src/test/resources/tests/query/LOGICAL/OR_AND/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/OR_AND/SIMPLE_TREECONCEPT_Query.test.json
index 3ec600da44..e20dcbb384 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/OR_AND/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/OR_AND/SIMPLE_TREECONCEPT_Query.test.json
@@ -2,6 +2,14 @@
"type": "QUERY_TEST",
"label": "OR_AND Select test",
"expectedCsv": "tests/query/LOGICAL/OR_AND/expected.csv",
+ "sqlSpec": {
+ "isEnabled": true,
+ "comment": "Logical will hopefully be kicked.",
+ "supportedDialects": [
+ "POSTGRESQL",
+ "HANA"
+ ]
+ },
"query": {
"type": "CONCEPT_QUERY",
"root": {
diff --git a/backend/src/test/resources/tests/query/LOGICAL/OR_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/OR_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
index c4c151df1c..e17fa70e18 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/OR_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/OR_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
@@ -2,6 +2,14 @@
"type": "QUERY_TEST",
"label": "OR DATE LOGIC Test",
"expectedCsv": "tests/query/LOGICAL/OR_DATE_LOGICAL/expected.csv",
+ "sqlSpec": {
+ "isEnabled": true,
+ "comment": "Logical will hopefully be kicked.",
+ "supportedDialects": [
+ "POSTGRESQL",
+ "HANA"
+ ]
+ },
"query": {
"type": "CONCEPT_QUERY",
"dateAggregationMode" : "LOGICAL",
diff --git a/backend/src/test/resources/tests/query/LOGICAL/OR_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/LOGICAL/OR_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
index c0a02b05e7..3ffc528120 100644
--- a/backend/src/test/resources/tests/query/LOGICAL/OR_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/LOGICAL/OR_NEGATION_DATE_LOGICAL/SIMPLE_TREECONCEPT_Query.test.json
@@ -3,9 +3,10 @@
"label": "OR NEGATION DATE LOGIC Test",
"expectedCsv": "tests/query/LOGICAL/OR_NEGATION_DATE_LOGICAL/expected.csv",
"sqlSpec": {
- "isEnabled": true,
+ "comment" : "Logical will hopefully be removed",
+ "isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"query": {
diff --git a/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/SIMPLE_TREECONCEPT_Query.test.json b/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/SIMPLE_TREECONCEPT_Query.test.json
index 4e62f1935c..fcd5a10ae0 100644
--- a/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/SIMPLE_TREECONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/SIMPLE_TREECONCEPT_Query.test.json
@@ -4,13 +4,13 @@
"expectedCsv": "tests/query/MERGE/OR_EVENT_DATE_EXCLUDED/expected.csv",
"query": {
"type": "CONCEPT_QUERY",
- "dateAggregationMode" : "MERGE",
+ "dateAggregationMode": "MERGE",
"root": {
"type": "OR",
"children": [
{
"type": "CONCEPT",
- "excludeFromTimeAggregation" : true,
+ "excludeFromTimeAggregation": true,
"ids": [
"tree.a"
],
@@ -44,9 +44,9 @@
"connectors": {
"name": "connector",
"column": "table.column",
- "selects" : {
- "type" : "EVENT_DATE_UNION",
- "name" : "date_union"
+ "selects": {
+ "type": "EVENT_DATE_UNION",
+ "name": "date_union"
},
"validityDates": {
"name": "datum",
@@ -57,16 +57,16 @@
{
"name": "a",
"condition": {
- "type": "PREFIX_LIST",
- "prefixes": "A"
+ "type": "EQUAL",
+ "values": "A"
},
"children": []
},
{
"name": "b",
"condition": {
- "type": "PREFIX_LIST",
- "prefixes": "B"
+ "type": "EQUAL",
+ "values": "B"
},
"children": []
}
diff --git a/backend/src/test/resources/tests/query/MULTIPLE_TABLES_ICD_QUERY2/MULTIPLE_TABLES_ICD_KH_AU_QUERY_ohneFilter.test.json b/backend/src/test/resources/tests/query/MULTIPLE_TABLES_ICD_QUERY2/MULTIPLE_TABLES_ICD_KH_AU_QUERY_ohneFilter.test.json
index 81a9101b2f..a360c79153 100644
--- a/backend/src/test/resources/tests/query/MULTIPLE_TABLES_ICD_QUERY2/MULTIPLE_TABLES_ICD_KH_AU_QUERY_ohneFilter.test.json
+++ b/backend/src/test/resources/tests/query/MULTIPLE_TABLES_ICD_QUERY2/MULTIPLE_TABLES_ICD_KH_AU_QUERY_ohneFilter.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/MULTIPLE_TABLES_ICD_QUERY2/expected.csv",
diff --git a/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json b/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json
index a38bffee8f..ba37ff7869 100644
--- a/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY2/MULTI_SELECT_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json b/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY2/MULTI_SELECT_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json
index 1fabb7fd07..f0dbfd0f5f 100644
--- a/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY2/MULTI_SELECT_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/MULTI_SELECT_NEGATION_DATE_RESTRICTION_OR_CONCEPT_QUERY2/MULTI_SELECT_DATE_RESTRICTION_OR_CONCEPT_QUERY.test.json
@@ -13,24 +13,19 @@
"max": "2012-11-11"
},
"child": {
- "type": "OR",
- "children": [
+ "ids": [
+ "geschlecht_select"
+ ],
+ "type": "CONCEPT",
+ "tables": [
{
- "ids": [
- "geschlecht_select"
- ],
- "type": "CONCEPT",
- "tables": [
+ "id": "geschlecht_select.geschlecht_connector",
+ "filters": [
{
- "id": "geschlecht_select.geschlecht_connector",
- "filters": [
- {
- "filter": "geschlecht_select.geschlecht_connector.geschlecht",
- "type": "MULTI_SELECT",
- "value": [
- "f"
- ]
- }
+ "filter": "geschlecht_select.geschlecht_connector.geschlecht",
+ "type": "MULTI_SELECT",
+ "value": [
+ "f"
]
}
]
diff --git a/backend/src/test/resources/tests/query/NUMBER/NUMBER.test.json b/backend/src/test/resources/tests/query/NUMBER/NUMBER.test.json
deleted file mode 100644
index e20454e971..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER/NUMBER.test.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "type": "QUERY_TEST",
- "label": "NUMBER_QUERY Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv": "tests/query/NUMBER/expected.csv",
- "query": {
- "type": "CONCEPT_QUERY",
- "root": {
- "type": "AND",
- "children": [
- {
- "type": "DATE_RESTRICTION",
- "dateRange": {
- "min": "2014-02-12",
- "max": "2014-12-13"
- },
- "child": {
- "ids": [
- "number"
- ],
- "type": "CONCEPT",
- "label": "vs",
- "tables": [
- {
- "id": "number.number_connector",
- "filters": [
- {
- "filter": "number.number_connector.value",
- "type": "REAL_RANGE",
- "value": {
- "min": 1,
- "max": 1
- }
- }
- ]
- }
- ]
- }
- }
- ]
- }
- },
- "concepts": [
- {
- "label": "number",
- "type": "TREE",
- "connectors": [
- {
- "label": "number_connector",
- "table": "table1",
- "validityDates": {
- "label": "datum",
- "column": "table1.datum"
- },
- "filters": {
- "label": "value",
- "description": "xy",
- "column": "table1.value",
- "type": "NUMBER"
- }
- }
- ]
- }
- ],
- "content": {
- "tables": [
- {
- "csv": "tests/query/NUMBER/content.csv",
- "name": "table1",
- "primaryColumn": {
- "name": "pid",
- "type": "STRING"
- },
- "columns": [
- {
- "name": "value",
- "type": "REAL"
- },
- {
- "name": "datum",
- "type": "DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER/content.csv b/backend/src/test/resources/tests/query/NUMBER/content.csv
deleted file mode 100644
index 956c447e1f..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER/content.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-pid,value,datum
-11,1,"2014-06-30/2015-06-30"
-20,1.01,"2014-06-30/2015-06-30"
-30,1,"2015-02-03/2015-06-30"
-40,0.5,"2014-06-30/2015-06-30"
-40,0.5,"2014-04-30/2014-06-30"
-51,1,"2014-06-30/2015-06-30"
-51,0.5,"2014-04-30/2014-06-30"
-61,1,"2014-06-30/2015-06-30"
-61,,"2014-04-30/2014-06-30"
-71,1,"2014-02-05/2014-02-20"
-71,1,"2014-04-30/2014-06-30"
-80,-1,"2014-06-30/2015-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER/expected.csv b/backend/src/test/resources/tests/query/NUMBER/expected.csv
deleted file mode 100644
index dee5478e65..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER/expected.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-result,dates
-11,{2014-06-30/2014-12-13}
-51,{2014-06-30/2014-12-13}
-61,{2014-06-30/2014-12-13}
-71,"{2014-02-12/2014-02-20,2014-04-30/2014-06-30}"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING/NUMBER.test.json b/backend/src/test/resources/tests/query/NUMBER_MISSING/NUMBER.test.json
index 3047d62b66..24ae3e4b62 100644
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING/NUMBER.test.json
+++ b/backend/src/test/resources/tests/query/NUMBER_MISSING/NUMBER.test.json
@@ -1,94 +1,93 @@
-{
- "type":"QUERY_TEST",
- "label":"NUMBER_MISSING_QUERY Test",
- "sqlSpec": {
+{
+ "type": "QUERY_TEST",
+ "label": "NUMBER_MISSING_QUERY Test",
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "HANA"
]
},
- "expectedCsv":"tests/query/NUMBER_MISSING/expected.csv",
- "query":{
- "type":"CONCEPT_QUERY",
+ "expectedCsv": "tests/query/NUMBER_MISSING/expected.csv",
+ "query": {
+ "type": "CONCEPT_QUERY",
"root": {
"type": "AND",
"children": [
{
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2014-02-12",
- "max":"2014-12-13"
- },
- "child":{
-
- "ids":[
- "number"
- ],
- "type":"CONCEPT",
- "label":"vs",
- "tables":[
- {
- "id":"number.number_connector",
- "filters":[
- {
- "filter":"number.number_connector.value",
- "type":"REAL_RANGE",
- "value":{
- "min": 0,
- "max": 0
- }
- }
- ]
- }
- ]
-
- }
- }
- ]
- }
- },
- "concepts":[
- {
- "label":"number",
- "type":"TREE",
- "connectors":[
- {
- "label":"number_connector",
- "table":"table1",
- "validityDates":{
- "label":"datum",
- "column":"table1.datum"
- },
- "filters":{
- "label":"value",
- "description":"xy",
- "column":"table1.value",
- "type":"NUMBER"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/NUMBER_MISSING/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns": [
- {
- "name": "value",
- "type": "REAL"
- },
- {
- "name": "datum",
- "type": "DATE_RANGE"
+ "type": "DATE_RESTRICTION",
+ "dateRange": {
+ "min": "2014-02-12",
+ "max": "2014-12-13"
+ },
+ "child": {
+ "ids": [
+ "number"
+ ],
+ "type": "CONCEPT",
+ "label": "vs",
+ "tables": [
+ {
+ "id": "number.number_connector",
+ "filters": [
+ {
+ "filter": "number.number_connector.value",
+ "type": "REAL_RANGE",
+ "value": {
+ "min": 0,
+ "max": 0
+ }
+ }
+ ]
+ }
+ ]
+ }
}
]
- }
+ }
+ },
+ "concepts": [
+ {
+ "label": "number",
+ "type": "TREE",
+ "connectors": [
+ {
+ "label": "number_connector",
+ "table": "table1",
+ "validityDates": {
+ "label": "datum",
+ "column": "table1.datum"
+ },
+ "filters": {
+ "label": "value",
+ "description": "xy",
+ "column": "table1.value",
+ "type": "NUMBER"
+ }
+ }
]
- }
+ }
+ ],
+ "content": {
+ "tables": [
+ {
+ "csv": "tests/query/NUMBER_MISSING/content.csv",
+ "name": "table1",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "value",
+ "type": "REAL"
+ },
+ {
+ "name": "datum",
+ "type": "DATE"
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING/content.csv b/backend/src/test/resources/tests/query/NUMBER_MISSING/content.csv
index ece22f450b..94c9653c0a 100644
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING/content.csv
+++ b/backend/src/test/resources/tests/query/NUMBER_MISSING/content.csv
@@ -1,5 +1,5 @@
pid,value,datum
-11,0,"2014-06-30/2015-06-30"
-20,,"2014-06-30/2015-06-30"
-30,0,"2015-04-30/2015-06-30"
-40,,"2015-04-30/2015-06-30"
\ No newline at end of file
+11,0,"2014-06-30"
+20,,"2014-06-30"
+30,0,"2015-04-30"
+40,,"2015-04-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING/expected.csv b/backend/src/test/resources/tests/query/NUMBER_MISSING/expected.csv
index 12f510e9fe..bba750fe79 100644
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING/expected.csv
+++ b/backend/src/test/resources/tests/query/NUMBER_MISSING/expected.csv
@@ -1,2 +1,2 @@
result,dates
-11,{2014-06-30/2014-12-13}
\ No newline at end of file
+11,{2014-06-30/2014-06-30}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/NUMBER.test.json b/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/NUMBER.test.json
deleted file mode 100644
index 5d0cdf7453..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/NUMBER.test.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"NUMBER_MISSING_NO_FILTER_RESTRICTION_QUERY Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/NUMBER_MISSING_NO_RESTRICTION/expected.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root": {
- "type": "AND",
- "children": [
- {
- "type":"DATE_RESTRICTION",
- "dateRange":{
- "min":"2014-02-12",
- "max":"2014-12-13"
- },
- "child":{
-
- "ids":[
- "number"
- ],
- "type":"CONCEPT",
- "label":"vs",
- "tables":[
- {
- "id":"number.number_connector",
- "filters":[ ]
- }
- ]
-
- }
- }
- ]
- }
- },
- "concepts":[
- {
- "label":"number",
- "type":"TREE",
- "connectors":[
- {
- "label":"number_connector",
- "table":"table1",
- "validityDates":{
- "label":"datum",
- "column":"table1.datum"
- },
- "filters":{
- "label":"value",
- "description":"xy",
- "column":"table1.value",
- "type":"NUMBER"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/NUMBER_MISSING_NO_RESTRICTION/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns": [
- {
- "name": "value",
- "type": "REAL"
- },
- {
- "name": "datum",
- "type": "DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/NUMBER2.test.json b/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/NUMBER2.test.json
deleted file mode 100644
index 54657c85c1..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/NUMBER2.test.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "type":"QUERY_TEST",
- "label":"NUMBER_MISSING_NO_RESTRICTION_QUERY Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
- "expectedCsv":"tests/query/NUMBER_MISSING_NO_RESTRICTION/expected2.csv",
- "query":{
- "type":"CONCEPT_QUERY",
- "root": {
- "type": "AND",
- "children": [
- {
- "type":"OR",
- "children":[
- {
-
- "ids":[
- "number"
- ],
- "type":"CONCEPT",
- "label":"vs",
- "tables":[
- {
- "id":"number.number_connector",
- "filters":[ ]
- }
- ]
-
- }
- ]
- }
- ]
- }
- },
- "concepts":[
- {
- "label":"number",
- "type":"TREE",
- "connectors":[
- {
- "label":"number_connector",
- "table":"table1",
- "validityDates":{
- "label":"datum",
- "column":"table1.datum"
- },
- "filters":{
- "label":"value",
- "description":"xy",
- "column":"table1.value",
- "type":"NUMBER"
- }
- }
- ]
- }
- ],
- "content":{
- "tables":[
- {
- "csv":"tests/query/NUMBER_MISSING_NO_RESTRICTION/content.csv",
- "name":"table1",
- "primaryColumn":{
- "name":"pid",
- "type":"STRING"
- },
- "columns": [
- {
- "name": "value",
- "type": "REAL"
- },
- {
- "name": "datum",
- "type": "DATE_RANGE"
- }
- ]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/content.csv b/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/content.csv
deleted file mode 100644
index ece22f450b..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/content.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-pid,value,datum
-11,0,"2014-06-30/2015-06-30"
-20,,"2014-06-30/2015-06-30"
-30,0,"2015-04-30/2015-06-30"
-40,,"2015-04-30/2015-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/expected.csv b/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/expected.csv
deleted file mode 100644
index a2a659fbca..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/expected.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-result,dates
-11,{2014-06-30/2014-12-13}
-20,{2014-06-30/2014-12-13}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/expected2.csv b/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/expected2.csv
deleted file mode 100644
index c1f2429eaf..0000000000
--- a/backend/src/test/resources/tests/query/NUMBER_MISSING_NO_RESTRICTION/expected2.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-result,dates
-11,{2014-06-30/2015-06-30}
-20,{2014-06-30/2015-06-30}
-30,{2015-04-30/2015-06-30}
-40,{2015-04-30/2015-06-30}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_NEGATION/NUMBER.test.json b/backend/src/test/resources/tests/query/NUMBER_NEGATION/NUMBER.test.json
index fbf1cf7845..e8eff44b85 100644
--- a/backend/src/test/resources/tests/query/NUMBER_NEGATION/NUMBER.test.json
+++ b/backend/src/test/resources/tests/query/NUMBER_NEGATION/NUMBER.test.json
@@ -1,10 +1,11 @@
{
"type": "QUERY_TEST",
"label": "NUMBER_NEGATION_QUERY Test",
- "sqlSpec": {
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "HANA"
]
},
"expectedCsv": "tests/query/NUMBER_NEGATION/expected.csv",
@@ -13,38 +14,33 @@
"root": {
"type": "NEGATION",
"child": {
- "type": "AND",
- "children": [
- {
- "type": "DATE_RESTRICTION",
- "dateRange": {
- "min": "2014-02-12",
- "max": "2014-12-13"
- },
- "child": {
- "ids": [
- "number"
- ],
- "type": "CONCEPT",
- "label": "vs",
- "tables": [
+ "type": "DATE_RESTRICTION",
+ "dateRange": {
+ "min": "2014-02-12",
+ "max": "2014-12-13"
+ },
+ "child": {
+ "ids": [
+ "number"
+ ],
+ "type": "CONCEPT",
+ "label": "vs",
+ "tables": [
+ {
+ "id": "number.number_connector",
+ "filters": [
{
- "id": "number.number_connector",
- "filters": [
- {
- "filter": "number.number_connector.value",
- "type": "REAL_RANGE",
- "value": {
- "min": 1,
- "max": 1
- }
- }
- ]
+ "filter": "number.number_connector.value",
+ "type": "REAL_RANGE",
+ "value": {
+ "min": 1,
+ "max": 1
+ }
}
]
}
- }
- ]
+ ]
+ }
}
}
},
@@ -86,7 +82,7 @@
},
{
"name": "datum",
- "type": "DATE_RANGE"
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/NUMBER_NEGATION/content.csv b/backend/src/test/resources/tests/query/NUMBER_NEGATION/content.csv
index 956c447e1f..144dc4d388 100644
--- a/backend/src/test/resources/tests/query/NUMBER_NEGATION/content.csv
+++ b/backend/src/test/resources/tests/query/NUMBER_NEGATION/content.csv
@@ -1,13 +1,13 @@
pid,value,datum
-11,1,"2014-06-30/2015-06-30"
-20,1.01,"2014-06-30/2015-06-30"
-30,1,"2015-02-03/2015-06-30"
-40,0.5,"2014-06-30/2015-06-30"
-40,0.5,"2014-04-30/2014-06-30"
-51,1,"2014-06-30/2015-06-30"
-51,0.5,"2014-04-30/2014-06-30"
-61,1,"2014-06-30/2015-06-30"
-61,,"2014-04-30/2014-06-30"
-71,1,"2014-02-05/2014-02-20"
-71,1,"2014-04-30/2014-06-30"
-80,-1,"2014-06-30/2015-06-30"
\ No newline at end of file
+11,1,"2014-06-30"
+20,1.01,"2014-06-30"
+30,1,"2015-02-03"
+40,0.5,"2014-06-30"
+40,0.5,"2014-06-30"
+51,1,"2014-06-30"
+51,0.5,"2014-06-30"
+61,1,"2014-06-30"
+61,,"2014-06-30"
+71,1,"2014-06-30"
+71,1,"2014-06-30"
+80,-1,"2014-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/NUMBER.test.json b/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/NUMBER.test.json
index bae2f930e0..003135292d 100644
--- a/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/NUMBER.test.json
+++ b/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/NUMBER.test.json
@@ -1,12 +1,6 @@
{
"type": "QUERY_TEST",
"label": "STRING NUMBER PARSER Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/query/NUMBER_STRING_PARSER/expected.csv",
"query": {
"type": "CONCEPT_QUERY",
@@ -47,7 +41,8 @@
"column": "table1.value",
"validityDates": {
"label": "datum",
- "column": "table1.datum"
+ "startColumn": "table1.start",
+ "endColumn": "table1.end"
},
"selects": {
"name" : "value",
@@ -73,8 +68,12 @@
"type": "STRING"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/content.csv b/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/content.csv
index a70bf9f701..f66b6a9a4f 100644
--- a/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/content.csv
+++ b/backend/src/test/resources/tests/query/NUMBER_STRING_PARSER/content.csv
@@ -1,4 +1,4 @@
-pid,value,datum
-1,1,"2014-06-30/2014-06-30"
-2,2,"2014-06-30/2014-06-30"
-3,3,"2014-06-30/2014-06-30"
+pid,value,start,end
+1,1,"2014-06-30","2014-06-30"
+2,2,"2014-06-30","2014-06-30"
+3,3,"2014-06-30","2014-06-30"
diff --git a/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/NUMBER.test.json b/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/NUMBER.test.json
index 6b0f76bd31..f18c045f9b 100644
--- a/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/NUMBER.test.json
+++ b/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/NUMBER.test.json
@@ -1,12 +1,6 @@
{
"type": "QUERY_TEST",
"label": "STRING NUMBER PARSER Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/query/NUMBER_STRING_PREFIXED_PARSER/expected.csv",
"query": {
"type": "CONCEPT_QUERY",
@@ -38,7 +32,8 @@
"table": "table1",
"validityDates": {
"label": "datum",
- "column": "table1.datum"
+ "startColumn": "table1.start",
+ "endColumn": "table1.end"
},
"selects": {
"name" : "value",
@@ -64,8 +59,12 @@
"type": "STRING"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/content.csv b/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/content.csv
index ab3498eea5..a9e7972ae3 100644
--- a/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/content.csv
+++ b/backend/src/test/resources/tests/query/NUMBER_STRING_PREFIXED_PARSER/content.csv
@@ -1,4 +1,4 @@
-pid,value,datum
-1,-09,"2014-06-30/2014-06-30"
-2,-10,"2014-06-30/2014-06-30"
-3,-11,"2014-06-30/2014-06-30"
+pid,value,start,end
+1,-09,"2014-06-30","2014-06-30"
+2,-10,"2014-06-30","2014-06-30"
+3,-11,"2014-06-30","2014-06-30"
diff --git a/backend/src/test/resources/tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/REL_EXPORT_Query.test.json b/backend/src/test/resources/tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/REL_EXPORT_Query.test.json
index e6893f6ab8..6ef36b7970 100644
--- a/backend/src/test/resources/tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/REL_EXPORT_Query.test.json
+++ b/backend/src/test/resources/tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/REL_EXPORT_Query.test.json
@@ -1,122 +1,130 @@
{
- "type": "QUERY_TEST",
- "label": "REL_EXPORT WITH DATES Test",
- "expectedCsv": "tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/expected.csv",
+ "type": "QUERY_TEST",
+ "label": "REL_EXPORT WITH DATES Test",
+ "sqlSpec": {
+ "isEnabled": true,
+ "comment": "Lateral JOINS are not possible with Clickhouse yet.",
+ "supportedDialects": [
+ "POSTGRESQL",
+ "HANA"
+ ]
+ },
+ "expectedCsv": "tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/expected.csv",
+ "query": {
+ "type": "RELATIVE_FORM_QUERY",
+ "resolutionsAndAlignmentMap": [
+ {
+ "resolution": "COMPLETE",
+ "alignment": "NO_ALIGN"
+ },
+ {
+ "resolution": "QUARTERS",
+ "alignment": "QUARTER"
+ }
+ ],
"query": {
- "type": "RELATIVE_FORM_QUERY",
- "resolutionsAndAlignmentMap": [
- {
- "resolution": "COMPLETE",
- "alignment": "NO_ALIGN"
- },
- {
- "resolution": "QUARTERS",
- "alignment": "QUARTER"
- }
+ "type": "CONCEPT_QUERY",
+ "root": {
+ "type": "CONCEPT",
+ "ids": [
+ "test_tree.test_child1"
],
- "query": {
- "type": "CONCEPT_QUERY",
- "root": {
- "type": "CONCEPT",
- "ids": [
- "test_tree.test_child1"
- ],
- "tables": [
- {
- "id": "test_tree.test_column",
- "filters": []
- }
- ]
- }
- },
- "features": {
- "type": "ARRAY_CONCEPT_QUERY",
- "childQueries": {
- "type": "CONCEPT_QUERY",
- "root": {
- "type": "CONCEPT",
- "ids": [
- "test_tree.test_child1"
- ],
- "selects": [
- "test_tree.exists"
- ],
- "tables": [
- {
- "id": "test_tree.test_column",
- "filters": []
- }
- ]
- }
+ "tables": [
+ {
+ "id": "test_tree.test_column",
+ "filters": []
+ }
+ ]
+ }
+ },
+ "features": {
+ "type": "ARRAY_CONCEPT_QUERY",
+ "childQueries": {
+ "type": "CONCEPT_QUERY",
+ "root": {
+ "type": "CONCEPT",
+ "ids": [
+ "test_tree.test_child1"
+ ],
+ "selects": [
+ "test_tree.exists"
+ ],
+ "tables": [
+ {
+ "id": "test_tree.test_column",
+ "filters": []
}
- },
- "indexSelector": "EARLIEST",
- "indexPlacement": "BEFORE",
- "timeCountBefore": 4,
- "timeCountAfter": 4,
- "timeUnit": "QUARTERS"
+ ]
+ }
+ }
},
- "concepts": [
+ "indexSelector": "EARLIEST",
+ "indexPlacement": "BEFORE",
+ "timeCountBefore": 4,
+ "timeCountAfter": 4,
+ "timeUnit": "QUARTERS"
+ },
+ "concepts": [
+ {
+ "label": "test_tree",
+ "type": "TREE",
+ "connectors": {
+ "label": "tree_label",
+ "name": "test_column",
+ "column": "test_table.test_column",
+ "validityDates": {
+ "label": "datum",
+ "column": "test_table.datum"
+ }
+ },
+ "selects": [
{
- "label": "test_tree",
- "type": "TREE",
- "connectors": {
- "label": "tree_label",
- "name": "test_column",
- "column": "test_table.test_column",
- "validityDates": {
- "label": "datum",
- "column": "test_table.datum"
- }
- },
- "selects": [
- {
- "type": "EXISTS",
- "name": "exists"
- }
- ],
- "children": [
- {
- "label": "test_child1",
- "description": " ",
- "condition": {
- "type": "PREFIX_LIST",
- "prefixes": "A1"
- },
- "children": []
- },
- {
- "label": "test_child2",
- "description": " ",
- "condition": {
- "type": "PREFIX_LIST",
- "prefixes": "B2"
- },
- "children": []
- }
- ]
+ "type": "EXISTS",
+ "name": "exists"
}
- ],
- "content": {
- "tables": [
- {
- "csv": "tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/content.csv",
- "name": "test_table",
- "primaryColumn": {
- "name": "pid",
- "type": "STRING"
- },
- "columns": [
- {
- "name": "datum",
- "type": "DATE"
- },
- {
- "name": "test_column",
- "type": "STRING"
- }
- ]
- }
- ]
+ ],
+ "children": [
+ {
+ "label": "test_child1",
+ "description": " ",
+ "condition": {
+ "type": "PREFIX_LIST",
+ "prefixes": "A1"
+ },
+ "children": []
+ },
+ {
+ "label": "test_child2",
+ "description": " ",
+ "condition": {
+ "type": "PREFIX_LIST",
+ "prefixes": "B2"
+ },
+ "children": []
+ }
+ ]
}
+ ],
+ "content": {
+ "tables": [
+ {
+ "csv": "tests/query/REL_EXPORT/PREREQUISITE_WITH_DATES/content.csv",
+ "name": "test_table",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "datum",
+ "type": "DATE"
+ },
+ {
+ "name": "test_column",
+ "type": "STRING"
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/REUSED_QUERY/REUSED_Query.test.json b/backend/src/test/resources/tests/query/REUSED_QUERY/REUSED_Query.test.json
index 94935042b7..84ae3fcc7f 100644
--- a/backend/src/test/resources/tests/query/REUSED_QUERY/REUSED_Query.test.json
+++ b/backend/src/test/resources/tests/query/REUSED_QUERY/REUSED_Query.test.json
@@ -1,12 +1,6 @@
{
"type": "QUERY_TEST",
"label": "REUSED_QUERY Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/query/REUSED_QUERY/expected.csv",
"query": {
"type": "CONCEPT_QUERY",
@@ -16,7 +10,6 @@
}
},
"concepts": [
-
],
"content": {
"tables": [
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID/SECONDARY_IDS.test.json b/backend/src/test/resources/tests/query/SECONDARY_ID/SECONDARY_IDS.test.json
index f6aaec366e..deeb26e641 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID/SECONDARY_IDS.test.json
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID/SECONDARY_IDS.test.json
@@ -1,51 +1,41 @@
{
"type": "QUERY_TEST",
"label": "SECONDARY_ID Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
+
"expectedCsv": "tests/query/SECONDARY_ID/expected.csv",
"query": {
"type": "SECONDARY_ID_QUERY",
"secondaryId": "secondary",
"root": {
- "type": "AND",
- "children": [
+ "ids": [
+ "number"
+ ],
+ "type": "CONCEPT",
+ "excludeFromSecondaryId": false,
+ "tables": [
{
- "ids": [
- "number"
- ],
- "type": "CONCEPT",
- "excludeFromSecondaryId" : false,
- "tables": [
+ "id": "number.number_connector",
+ "filters": [
{
- "id": "number.number_connector",
- "filters": [
- {
- "filter": "number.number_connector.value",
- "type": "REAL_RANGE",
- "value": {
- "min": 1,
- "max": 1
- }
- }
- ]
- },
+ "filter": "number.number_connector.value",
+ "type": "REAL_RANGE",
+ "value": {
+ "min": 1,
+ "max": 1
+ }
+ }
+ ]
+ },
+ {
+ "id": "number.number_connector2",
+ "filters": [
{
- "id": "number.number_connector2",
- "filters": [
- {
- "filter": "number.number_connector2.value",
- "type": "REAL_RANGE",
- "value": {
- "min": 1,
- "max": 1
- }
- }
- ]
+ "filter": "number.number_connector2.value",
+ "type": "REAL_RANGE",
+ "value": {
+ "min": 1,
+ "max": 1
+ }
}
]
}
@@ -62,7 +52,8 @@
"table": "table1",
"validityDates": {
"label": "datum",
- "column": "table1.datum"
+ "startColumn": "table1.start",
+ "endColumn": "table1.end"
},
"filters": {
"label": "value",
@@ -76,7 +67,8 @@
"table": "table12",
"validityDates": {
"label": "datum",
- "column": "table12.datum"
+ "startColumn": "table12.start",
+ "endColumn": "table12.end"
},
"filters": {
"label": "value",
@@ -116,8 +108,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
},
@@ -139,8 +135,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID/content.csv b/backend/src/test/resources/tests/query/SECONDARY_ID/content.csv
index adf8faca3b..8bd0063f92 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID/content.csv
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID/content.csv
@@ -1,7 +1,7 @@
-pid,sid,value,datum
-a,f_a1,1,"2014-06-30/2015-06-30"
-a,f_a1,1,"2016-06-30/2016-06-30"
-a,f_a2,1,"2014-06-30/2015-06-30"
-a,,1,"2010-06-30/2010-06-30"
-a,f_a3,1.01,"2014-06-30/2015-06-30"
-b,f_b1,1,"2015-02-03/2015-06-30"
\ No newline at end of file
+pid,sid,value,start,end
+a,f_a1,1,"2014-06-30","2015-06-30"
+a,f_a1,1,"2016-06-30","2016-06-30"
+a,f_a2,1,"2014-06-30","2015-06-30"
+a,,1,"2010-06-30","2010-06-30"
+a,f_a3,1.01,"2014-06-30","2015-06-30"
+b,f_b1,1,"2015-02-03","2015-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID/content2.csv b/backend/src/test/resources/tests/query/SECONDARY_ID/content2.csv
index 341cac8290..b2b9f50ce7 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID/content2.csv
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID/content2.csv
@@ -1,7 +1,7 @@
-pid,sid,value,datum
-a,f_a4,1,"2024-06-30/2025-06-30"
-a,f_a4,1,"2026-06-30/2026-06-30"
-a,f_a4,1,"2024-06-30/2025-06-30"
-a,,13,"2020-06-30/2020-06-30"
-a,f_a5,1.01,"2024-06-30/2025-06-30"
-b,f_b6,1,"2025-02-03/2025-06-30"
\ No newline at end of file
+pid,sid,value,start,end
+a,f_a4,1,"2024-06-30","2025-06-30"
+a,f_a4,1,"2026-06-30","2026-06-30"
+a,f_a4,1,"2024-06-30","2025-06-30"
+a,,13,"2020-06-30","2020-06-30"
+a,f_a5,1.01,"2024-06-30","2025-06-30"
+b,f_b6,1,"2025-02-03","2025-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/SECONDARY_IDS.test.json b/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/SECONDARY_IDS.test.json
index 65a834c256..15150a0c85 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/SECONDARY_IDS.test.json
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/SECONDARY_IDS.test.json
@@ -1,12 +1,6 @@
{
"type": "QUERY_TEST",
"label": "SECONDARY_ID Test",
- "sqlSpec": {
- "isEnabled": true,
- "supportedDialects": [
- "POSTGRESQL"
- ]
- },
"expectedCsv": "tests/query/SECONDARY_ID_DATEMODE_LOGICAL/expected.csv",
"query": {
"type": "SECONDARY_ID_QUERY",
@@ -20,7 +14,7 @@
"number"
],
"type": "CONCEPT",
- "excludeFromSecondaryId" : false,
+ "excludeFromSecondaryId": false,
"label": "vs",
"tables": [
{
@@ -43,7 +37,7 @@
"number"
],
"type": "CONCEPT",
- "excludeFromSecondaryId" : false,
+ "excludeFromSecondaryId": false,
"label": "vs",
"tables": [
{
@@ -74,7 +68,8 @@
"table": "table1",
"validityDates": {
"label": "datum",
- "column": "table1.datum"
+ "startColumn": "table1.start",
+ "endColumn": "table1.end"
},
"filters": {
"label": "value",
@@ -88,7 +83,8 @@
"table": "table12",
"validityDates": {
"label": "datum",
- "column": "table12.datum"
+ "startColumn": "table12.start",
+ "endColumn": "table12.end"
},
"filters": {
"label": "value",
@@ -128,8 +124,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
},
@@ -151,8 +151,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
}
]
}
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content.csv b/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content.csv
index af01f4ad60..ef133adc98 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content.csv
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content.csv
@@ -1,5 +1,5 @@
-pid,sid,value,datum
-a,f_a1,1,"2014-06-30/2015-06-30"
-a,f_a1,1,"2016-06-30/2027-06-30"
-a,f_a2,1,"2014-06-30/2015-06-30"
-a,,1,"2010-06-30/2010-06-30"
\ No newline at end of file
+pid,sid,value,start,end
+a,f_a1,1,"2014-06-30","2015-06-30"
+a,f_a1,1,"2016-06-30","2027-06-30"
+a,f_a2,1,"2014-06-30","2015-06-30"
+a,,1,"2010-06-30","2010-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content2.csv b/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content2.csv
index 26b8b4c28f..490e729f33 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content2.csv
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_DATEMODE_LOGICAL/content2.csv
@@ -1,5 +1,5 @@
-pid,sid,value,datum
-a,f_a1,1,"2024-06-30/2025-06-30"
-a,f_a1,1,"2026-06-30/2026-06-30"
-a,f_a2,1,"2024-06-30/2025-06-30"
-a,,13,"2020-06-30/2020-06-30"
\ No newline at end of file
+pid,sid,value,start,end
+a,f_a1,1,"2024-06-30","2025-06-30"
+a,f_a1,1,"2026-06-30","2026-06-30"
+a,f_a2,1,"2024-06-30","2025-06-30"
+a,,13,"2020-06-30","2020-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_EXCLUDED/SECONDARY_IDS_EXCLUDED.test.json b/backend/src/test/resources/tests/query/SECONDARY_ID_EXCLUDED/SECONDARY_IDS_EXCLUDED.test.json
index 4946887995..3f90542fba 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_EXCLUDED/SECONDARY_IDS_EXCLUDED.test.json
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_EXCLUDED/SECONDARY_IDS_EXCLUDED.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/SECONDARY_ID_EXCLUDED/expected.csv",
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/SECONDARY_IDS.test.json b/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/SECONDARY_IDS.test.json
index d9949527da..ec451c8cd0 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/SECONDARY_IDS.test.json
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/SECONDARY_IDS.test.json
@@ -1,104 +1,110 @@
{
- "type": "QUERY_TEST",
- "label": "SECONDARY_ID Test",
- "sqlSpec": {
+ "type": "QUERY_TEST",
+ "label": "SECONDARY_ID Test",
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "HANA"
]
},
- "expectedCsv": "tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/expected.csv",
- "query": {
- "type": "SECONDARY_ID_QUERY",
- "root": {
- "type": "AND",
- "children": [
- {
- "type": "EXTERNAL",
- "format": [
- "ID",
- "START_DATE",
- "END_DATE"
- ],
- "values": [
- [
- "pid",
- "START_DATUM",
- "END_DATUM"
- ],
- [
- "a",
- "01.01.2016",
- "30.06.2016"
- ]
- ]
- },
- {
- "ids": [
- "number"
- ],
- "type": "CONCEPT",
- "excludeFromSecondaryId": false,
- "tables": [
- {
- "id": "number.number_connector"
- }
- ]
- }
- ]
- },
+ "expectedCsv": "tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/expected.csv",
+ "query": {
+ "type": "SECONDARY_ID_QUERY",
+ "root": {
+ "type": "AND",
+ "children": [
+ {
+ "type": "EXTERNAL",
+ "format": [
+ "ID",
+ "START_DATE",
+ "END_DATE"
+ ],
+ "values": [
+ [
+ "pid",
+ "START_DATUM",
+ "END_DATUM"
+ ],
+ [
+ "a",
+ "01.01.2016",
+ "30.06.2016"
+ ]
+ ]
+ },
+ {
+ "ids": [
+ "number"
+ ],
+ "type": "CONCEPT",
+ "excludeFromSecondaryId": false,
+ "tables": [
+ {
+ "id": "number.number_connector"
+ }
+ ]
+ }
+ ]
+ },
"dateAggregationMode": "LOGICAL",
"secondaryId": "secondary"
- },
- "concepts": [
- {
- "label": "number",
- "type": "TREE",
- "connectors": [
- {
- "label": "number_connector",
- "table": "table1",
- "validityDates": {
- "label": "datum",
- "column": "table1.datum"
- }
- }
- ]
- }
- ],
- "content": {
- "secondaryIds": [
- {
- "name": "secondary"
- },
- {
- "name": "ignored"
- }
- ],
- "tables": [
- {
- "csv": "tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/content.csv",
- "name": "table1",
- "primaryColumn": {
- "name": "pid",
- "type": "STRING"
- },
- "columns": [
- {
- "name": "sid",
- "type": "STRING",
- "secondaryId": "secondary"
- },
- {
- "name": "value",
- "type": "REAL"
- },
- {
- "name": "datum",
- "type": "DATE_RANGE"
- }
- ]
- }
- ]
- }
+ },
+ "concepts": [
+ {
+ "label": "number",
+ "type": "TREE",
+ "connectors": [
+ {
+ "label": "number_connector",
+ "table": "table1",
+ "validityDates": {
+ "label": "datum",
+ "startColumn": "table1.start",
+ "endColumn": "table1.start"
+ }
+ }
+ ]
+ }
+ ],
+ "content": {
+ "secondaryIds": [
+ {
+ "name": "secondary"
+ },
+ {
+ "name": "ignored"
+ }
+ ],
+ "tables": [
+ {
+ "csv": "tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/content.csv",
+ "name": "table1",
+ "primaryColumn": {
+ "name": "pid",
+ "type": "STRING"
+ },
+ "columns": [
+ {
+ "name": "sid",
+ "type": "STRING",
+ "secondaryId": "secondary"
+ },
+ {
+ "name": "value",
+ "type": "REAL"
+ },
+ {
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
+ }
+ ]
+ }
+ ]
+ }
}
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/content.csv b/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/content.csv
index a2f9c24861..c87a1fe0ea 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/content.csv
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_EXTERNAL_LOGICAL/content.csv
@@ -1,6 +1,6 @@
-pid,sid,value,datum
-a,f_a1,1,"2016-06-30/2016-06-30"
-a,f_a2,1,"2014-06-30/2015-06-30"
-a,,1,"2010-06-30/2010-06-30"
-b,f_b1,1,"2015-02-03/2015-06-30"
-a,f_a1,1,"2014-06-30/2015-06-30"
\ No newline at end of file
+pid,sid,value,start,end
+a,f_a1,1,"2016-06-30","2016-06-30"
+a,f_a2,1,"2014-06-30","2015-06-30"
+a,,1,"2010-06-30","2010-06-30"
+b,f_b1,1,"2015-02-03","2015-06-30"
+a,f_a1,1,"2014-06-30","2015-06-30"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/SECONDARY_ID_MIXED/SECONDARY_IDS_MIXED.test.json b/backend/src/test/resources/tests/query/SECONDARY_ID_MIXED/SECONDARY_IDS_MIXED.test.json
index fa1d2ced8d..7e779c161e 100644
--- a/backend/src/test/resources/tests/query/SECONDARY_ID_MIXED/SECONDARY_IDS_MIXED.test.json
+++ b/backend/src/test/resources/tests/query/SECONDARY_ID_MIXED/SECONDARY_IDS_MIXED.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/SECONDARY_ID_MIXED/expected.csv",
diff --git a/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY.test.json b/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY.test.json
index 5174e6edfb..47ad9b6ec3 100644
--- a/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/SIMPLE_CQEXTERNAL_QUERY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY_START_END.test.json b/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY_START_END.test.json
index 46cb3d2421..cc499535ff 100644
--- a/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY_START_END.test.json
+++ b/backend/src/test/resources/tests/query/SIMPLE_CQEXTERNAL_QUERY/SIMPLE_CQEXTERNAL_QUERY_START_END.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/SIMPLE_CQEXTERNAL_QUERY/expected_start_end.csv",
diff --git a/backend/src/test/resources/tests/query/SUM_EMPTY_DATE_CONCEPT_QUERY/SUM_EMPTY_DATE_CONCEPT_QUERY.test.json b/backend/src/test/resources/tests/query/SUM_EMPTY_DATE_CONCEPT_QUERY/SUM_EMPTY_DATE_CONCEPT_QUERY.test.json
index 58baa2536b..1bfc433444 100644
--- a/backend/src/test/resources/tests/query/SUM_EMPTY_DATE_CONCEPT_QUERY/SUM_EMPTY_DATE_CONCEPT_QUERY.test.json
+++ b/backend/src/test/resources/tests/query/SUM_EMPTY_DATE_CONCEPT_QUERY/SUM_EMPTY_DATE_CONCEPT_QUERY.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/SUM_EMPTY_DATE_CONCEPT_QUERY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TABLE_EXPORT/RAW_TABLE_EXPORT.test.json b/backend/src/test/resources/tests/query/TABLE_EXPORT/RAW_TABLE_EXPORT.test.json
index 2a8be93bcb..a380ece57f 100644
--- a/backend/src/test/resources/tests/query/TABLE_EXPORT/RAW_TABLE_EXPORT.test.json
+++ b/backend/src/test/resources/tests/query/TABLE_EXPORT/RAW_TABLE_EXPORT.test.json
@@ -1,10 +1,11 @@
{
"type": "QUERY_TEST",
"label": "RAW_TABLE_EXPORT Test",
- "sqlSpec": {
+ "sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL",
+ "HANA"
]
},
"expectedCsv": "tests/query/TABLE_EXPORT/raw_expected.csv",
@@ -88,7 +89,8 @@
"column": "table1.code",
"validityDates": {
"label": "datum",
- "column": "table1.datum"
+ "startColumn": "table1.start",
+ "endColumn": "table1.end"
},
"filters": {
"name": "value",
@@ -101,7 +103,8 @@
"column": "table2.code",
"validityDates": {
"label": "datum",
- "column": "table2.datum"
+ "startColumn": "table2.start",
+ "endColumn": "table2.end"
},
"filters": {
"name": "value",
@@ -147,8 +150,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
},
{
"name": "code",
@@ -174,8 +181,12 @@
"type": "REAL"
},
{
- "name": "datum",
- "type": "DATE_RANGE"
+ "name": "start",
+ "type": "DATE"
+ },
+ {
+ "name": "end",
+ "type": "DATE"
},
{
"name": "code",
diff --git a/backend/src/test/resources/tests/query/TABLE_EXPORT/content.csv b/backend/src/test/resources/tests/query/TABLE_EXPORT/content.csv
index 2a13b6523b..ecf4b48086 100644
--- a/backend/src/test/resources/tests/query/TABLE_EXPORT/content.csv
+++ b/backend/src/test/resources/tests/query/TABLE_EXPORT/content.csv
@@ -1,7 +1,7 @@
-pid,sid,value,datum,code
-a,f_a1,1,"2014-06-30/2015-06-30",a
-a,f_a1,1,"2016-06-30/2016-06-30",a
-a,f_a2,1,"2014-06-30/2015-06-30",a
-a,,1,"2010-06-30/2010-06-30",a
-a,f_a3,2,"2014-06-30/2015-06-30",b
-b,f_b1,1,"2015-02-03/2015-06-30",b
\ No newline at end of file
+pid,sid,value,start,end,code
+a,f_a1,1,"2014-06-30","2015-06-30",a
+a,f_a1,1,"2016-06-30","2016-06-30",a
+a,f_a2,1,"2014-06-30","2015-06-30",a
+a,,1,"2010-06-30","2010-06-30",a
+a,f_a3,2,"2014-06-30","2015-06-30",b
+b,f_b1,1,"2015-02-03","2015-06-30",b
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/TABLE_EXPORT/content2.csv b/backend/src/test/resources/tests/query/TABLE_EXPORT/content2.csv
index aa886e685d..2ab2525689 100644
--- a/backend/src/test/resources/tests/query/TABLE_EXPORT/content2.csv
+++ b/backend/src/test/resources/tests/query/TABLE_EXPORT/content2.csv
@@ -1,8 +1,8 @@
-pid,sid,value,datum,code
-a,f_a4,1,"2024-06-30/2025-06-30",b
-a,f_a4,1,"2026-06-30/2026-06-30",b
-a,f_a4,1,"2024-06-30/2025-06-30",b
-a,,13,"2020-06-30/2020-06-30",a
-a,,13,"2020-06-30/2020-06-30",c
-a,f_a5,2,"2024-06-30/2025-06-30",b
-b,f_b6,1,"2025-02-03/2025-06-30",c
\ No newline at end of file
+pid,sid,value,start,end,code
+a,f_a4,1,"2024-06-30","2025-06-30",b
+a,f_a4,1,"2026-06-30","2026-06-30",b
+a,f_a4,1,"2024-06-30","2025-06-30",b
+a,,13,"2020-06-30","2020-06-30",a
+a,,13,"2020-06-30","2020-06-30",c
+a,f_a5,2,"2024-06-30","2025-06-30",b
+b,f_b6,1,"2025-02-03","2025-06-30",c
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ALL/query.test.json
index 25a2627e97..3ae0cbceac 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ALL/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ANY/query.test.json
index 0c4505974a..c4bae87495 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ALL/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/EARLIEST/query.test.json
index 85f8d795d4..65395af76d 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ALL/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/LATEST/query.test.json
index 9b984b15f6..4901e8a673 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ALL/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ALL/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ALL/query.test.json
index 01259b2214..db282b5eab 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ANY/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ANY/query.test.json
index d8d334398c..37ae00d5f1 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ANY/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/EARLIEST/query.test.json
index a957f63754..ef678d2db4 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ANY/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/LATEST/query.test.json
index 6873fc1594..1c351ce764 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/ANY/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/ANY/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ALL/query.test.json
index bc4dc58248..ce3174cc80 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/EARLIEST/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ANY/query.test.json
index d04770c5a8..931711ba5c 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/EARLIEST/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/EARLIEST/query.test.json
index 8284fa8992..76330be12e 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/EARLIEST/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/LATEST/query.test.json
index 1229e6c11a..082989fb30 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/EARLIEST/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/EARLIEST/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ALL/query.test.json
index e39034076d..a1e43174c6 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/LATEST/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ANY/query.test.json
index 59c7c11de8..2f11dfbdb2 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/LATEST/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/EARLIEST/query.test.json
index c189fb5be6..07efef74fc 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/LATEST/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/LATEST/query.test.json
index 0cc099fbbe..fd57bdd513 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AFTER/LATEST/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AFTER/LATEST/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/AGGREGATION/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/AGGREGATION/query.test.json
index 57acb351a8..ee36a552fb 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/AGGREGATION/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/AGGREGATION/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/AGGREGATION/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ALL/query.test.json
index 6c1ed4b11d..d28ab67598 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ALL/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ANY/query.test.json
index b9a2b278be..3bcd5df907 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ALL/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/EARLIEST/query.test.json
index ad71445d22..27b42c3ab4 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ALL/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/LATEST/query.test.json
index 2b7f905ca6..d4ad78395c 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ALL/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ALL/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ALL/query.test.json
index 36b3f6ab8a..effd0fe4eb 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ANY/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ANY/query.test.json
index 6772cf2426..5e0728c05a 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ANY/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/EARLIEST/query.test.json
index c54e4aafee..fa79996000 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ANY/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/LATEST/query.test.json
index 52fa609a09..e596d71a25 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/ANY/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/ANY/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ALL/query.test.json
index 3bafde26de..7393e820be 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/EARLIEST/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ANY/query.test.json
index 87b4e51e3f..6132182d3a 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/EARLIEST/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/EARLIEST/query.test.json
index 6fb1ed76d1..20e7edd02a 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/EARLIEST/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/LATEST/query.test.json
index a139f74c9c..c80b7b2456 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/EARLIEST/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/EARLIEST/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ALL/query.test.json
index afa2865beb..87b7fdd943 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/LATEST/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ANY/query.test.json
index a5df8a7379..ef56f61944 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/LATEST/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/EARLIEST/query.test.json
index f670bcf591..b1f678ecd4 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/LATEST/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/LATEST/query.test.json
index 82ee9004ba..0142abdfff 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/BEFORE/LATEST/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/BEFORE/LATEST/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ALL/query.test.json
index 73ce24ef71..8ffd6265bb 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ALL/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ANY/query.test.json
index 600ef55cdd..e593d88611 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ALL/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/EARLIEST/query.test.json
index 38cc7d9d0d..688552ae9a 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ALL/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/LATEST/query.test.json
index 06de13d9ea..491b4e4732 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ALL/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ALL/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ALL/query.test.json
index 3bb02194d6..34aa260150 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ANY/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ANY/query.test.json
index c2e019e76a..edc944a437 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ANY/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/EARLIEST/query.test.json
index 8c967c362c..fce2e634c3 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ANY/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/LATEST/query.test.json
index b2afa17da1..c6dc24ec4f 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/ANY/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/ANY/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ALL/query.test.json
index 43bc76f200..b5faa7763e 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/EARLIEST/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ANY/query.test.json
index de4af3c533..0cf40a68f5 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/EARLIEST/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/EARLIEST/query.test.json
index f752a2ea65..1cf7f8f070 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/EARLIEST/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/LATEST/query.test.json
index a978c71772..7966bed3c4 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/EARLIEST/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/EARLIEST/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ALL/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ALL/query.test.json
index b1d36ab1f5..dcca29b5a7 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ALL/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ALL/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/LATEST/ALL/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ANY/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ANY/query.test.json
index fd250e630b..2b16fc5588 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ANY/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/ANY/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/LATEST/ANY/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/EARLIEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/EARLIEST/query.test.json
index e9cfbb4626..5da04a85f6 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/EARLIEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/EARLIEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/LATEST/EARLIEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/LATEST/query.test.json b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/LATEST/query.test.json
index 57c1595e82..d046ead524 100644
--- a/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/LATEST/query.test.json
+++ b/backend/src/test/resources/tests/query/TEMPORAL/WHILE/LATEST/LATEST/query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": false,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/TEMPORAL/WHILE/LATEST/LATEST/expected.csv",
diff --git a/backend/src/test/resources/tests/query/VIRTUAL_CONCEPT_REUSED_QUERY/VIRTUAL_CONCEPT_REUSED_Query.test.json b/backend/src/test/resources/tests/query/VIRTUAL_CONCEPT_REUSED_QUERY/VIRTUAL_CONCEPT_REUSED_Query.test.json
index 1571d2808f..db20fd85da 100644
--- a/backend/src/test/resources/tests/query/VIRTUAL_CONCEPT_REUSED_QUERY/VIRTUAL_CONCEPT_REUSED_Query.test.json
+++ b/backend/src/test/resources/tests/query/VIRTUAL_CONCEPT_REUSED_QUERY/VIRTUAL_CONCEPT_REUSED_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/query/VIRTUAL_CONCEPT_REUSED_QUERY/expected.csv",
diff --git a/backend/src/test/resources/tests/sql/selects/first/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/sql/selects/first/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index 7aba42855a..8688d5afc0 100644
--- a/backend/src/test/resources/tests/sql/selects/first/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/sql/selects/first/FIRST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/sql/selects/first/FIRST_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json b/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
index 8a8fbd524e..4888215894 100644
--- a/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
+++ b/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/SIMPLE_VIRTUAL_CONCEPT_Query.test.json
@@ -4,7 +4,7 @@
"sqlSpec": {
"isEnabled": true,
"supportedDialects": [
- "POSTGRESQL"
+ "POSTGRESQL", "HANA"
]
},
"expectedCsv": "tests/sql/selects/first/LAST_AGGREGATOR/expected.csv",
diff --git a/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/content.csv b/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/content.csv
index bb1adca9de..3a33a7f81f 100644
--- a/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/content.csv
+++ b/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/content.csv
@@ -9,5 +9,3 @@ pid,datum,value
4,,"f"
5,2012-01-01,"m"
5,,"f"
-6,2012-01-01,"m"
-6,2012-01-01,"f"
\ No newline at end of file
diff --git a/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/expected.csv b/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/expected.csv
index 018d2a35a4..440b512dcd 100644
--- a/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/expected.csv
+++ b/backend/src/test/resources/tests/sql/selects/first/LAST_AGGREGATOR/expected.csv
@@ -3,4 +3,3 @@ result,dates,concept select
2,{2010-07-15/2010-07-15},
3,{2012-01-01/2012-01-02},f
5,{2012-01-01/2012-01-01},m
-6,{2012-01-01/2012-01-01},m
\ No newline at end of file