Merge pull request #3504 from ingef/fix/dont-override-in-cq

dont use config override in Conquery
ingef · Jul 25, 2024 · c8f3dc3 · c8f3dc3
2 parents f458e65 + 69778bd
commit c8f3dc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/IdColumnConfig.java
@@ -44,7 +44,7 @@ public class IdColumnConfig {
 	/**
 	 * Relevant in SQL-Mode, used as AllIdsTable for CQExternal and CQYes.
 	 */
-	private String table;
+	private String table = "entities";
 
 	/**
 	 * List of resolvable and printable ids.
@@ -56,7 +56,7 @@ public class IdColumnConfig {
 	private List<ColumnConfig> ids = List.of(
 			ColumnConfig.builder()
 						.name("ID")
-						.field("result")
+						.field("pid")
 						.label(Map.of(Locale.ROOT, "result"))
 						.primaryId(true)
 						.print(true)

diff --git a/backend/src/test/java/com/bakdata/conquery/integration/json/ConqueryTestSpec.java b/backend/src/test/java/com/bakdata/conquery/integration/json/ConqueryTestSpec.java
@@ -3,17 +3,14 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 import java.util.function.Consumer;
+
 import javax.annotation.Nullable;
 
 import com.bakdata.conquery.integration.IntegrationTest;
 import com.bakdata.conquery.io.cps.CPSBase;
 import com.bakdata.conquery.io.jackson.Jackson;
 import com.bakdata.conquery.io.jackson.View;
-import com.bakdata.conquery.io.storage.MetaStorage;
-import com.bakdata.conquery.models.config.ColumnConfig;
 import com.bakdata.conquery.models.config.ConqueryConfig;
 import com.bakdata.conquery.models.config.Dialect;
 import com.bakdata.conquery.models.config.IdColumnConfig;
@@ -56,17 +53,7 @@ public abstract class ConqueryTestSpec {
 	SqlSpec sqlSpec;
 
 	// default IdColumnConfig for SQL mode
-	private IdColumnConfig idColumns = new IdColumnConfig(
-			"entities",
-			List.of(
-					ColumnConfig.builder()
-								.name("ID")
-								.field("pid")
-								.primaryId(true)
-								.label(Map.of(Locale.ROOT, "result"))
-								.build()
-			)
-	);
+	private IdColumnConfig idColumns = null;
 
 	public ConqueryConfig overrideConfig(ConqueryConfig config) {