Fix missing MockDateNowSupplier in Sql integration tests (#3207)

ingef · Nov 13, 2023 · 978f3c0 · 978f3c0
1 parent 5805f86
commit 978f3c0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/sql/conversion/dialect/SqlDialect.java b/backend/src/main/java/com/bakdata/conquery/sql/conversion/dialect/SqlDialect.java
@@ -74,6 +74,11 @@ default List<SelectConverter<? extends Select>> customizeSelectConverters(List<S
 		return customize(getDefaultSelectConverters(), substitutes);
 	}
 
+	default List<FilterConverter<?, ?>> customizeFilterConverters(List<FilterConverter<?, ?>> substitutes) {
+		return customize(getDefaultFilterConverters(), substitutes);
+	}
+
+
 	default List<FilterConverter<?, ?>> getDefaultFilterConverters() {
 		return List.of(
 				new DateDistanceFilterConverter(DEFAULT_DATE_NOW_SUPPLIER),

diff --git a/...d/src/test/java/com/bakdata/conquery/integration/sql/dialect/HanaSqlIntegrationTests.java b/...d/src/test/java/com/bakdata/conquery/integration/sql/dialect/HanaSqlIntegrationTests.java
@@ -21,6 +21,8 @@
 import com.bakdata.conquery.models.config.SqlConnectorConfig;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.sql.DslContextFactory;
+import com.bakdata.conquery.sql.conversion.cqelement.concept.filter.DateDistanceFilterConverter;
+import com.bakdata.conquery.sql.conversion.cqelement.concept.filter.FilterConverter;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.select.DateDistanceSelectConverter;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.select.SelectConverter;
 import com.bakdata.conquery.sql.conversion.dialect.HanaSqlDialect;
@@ -107,14 +109,23 @@ public static void tearDownClass() {
 
 	private static class TestHanaDialect extends HanaSqlDialect implements TestSqlDialect {
 
+		public static final MockDateNowSupplier DATE_NOW_SUPPLIER = new MockDateNowSupplier();
+
 		public TestHanaDialect(DSLContext dslContext) {
 			super(dslContext);
 		}
 
 		@Override
 		public List<SelectConverter<? extends Select>> getSelectConverters() {
 			return this.customizeSelectConverters(List.of(
-					new DateDistanceSelectConverter(new MockDateNowSupplier())
+					new DateDistanceSelectConverter(DATE_NOW_SUPPLIER)
+			));
+		}
+
+		@Override
+		public List<FilterConverter<?, ?>> getFilterConverters() {
+			return this.customizeFilterConverters(List.of(
+					new DateDistanceFilterConverter(DATE_NOW_SUPPLIER)
 			));
 		}
 

diff --git a/...rc/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java b/...rc/test/java/com/bakdata/conquery/integration/sql/dialect/PostgreSqlIntegrationTests.java
@@ -14,6 +14,8 @@
 import com.bakdata.conquery.sql.DslContextFactory;
 import com.bakdata.conquery.sql.SqlQuery;
 import com.bakdata.conquery.sql.conquery.SqlManagedQuery;
+import com.bakdata.conquery.sql.conversion.cqelement.concept.filter.DateDistanceFilterConverter;
+import com.bakdata.conquery.sql.conversion.cqelement.concept.filter.FilterConverter;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.select.DateDistanceSelectConverter;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.select.SelectConverter;
 import com.bakdata.conquery.sql.conversion.dialect.PostgreSqlDialect;
@@ -92,14 +94,23 @@ public Stream<DynamicTest> sqlBackendTests() {
 
 	private static class TestPostgreSqlDialect extends PostgreSqlDialect implements TestSqlDialect {
 
+		public static final MockDateNowSupplier DATE_NOW_SUPPLIER = new MockDateNowSupplier();
+
 		public TestPostgreSqlDialect(DSLContext dslContext) {
 			super(dslContext);
 		}
 
 		@Override
 		public List<SelectConverter<? extends Select>> getSelectConverters() {
 			return this.customizeSelectConverters(List.of(
-					new DateDistanceSelectConverter(new MockDateNowSupplier())
+					new DateDistanceSelectConverter(DATE_NOW_SUPPLIER)
+			));
+		}
+
+		@Override
+		public List<FilterConverter<?, ?>> getFilterConverters() {
+			return this.customizeFilterConverters(List.of(
+					new DateDistanceFilterConverter(DATE_NOW_SUPPLIER)
 			));
 		}
 

diff --git a/backend/src/test/resources/tests/sql/filter/date_distance/months/expected.csv b/backend/src/test/resources/tests/sql/filter/date_distance/months/expected.csv
@@ -1,2 +1,3 @@
 pid,dates
+6,{}
 7,{}