Cleanup

Author: trzysiek

platform/parsers/elastic_query_dsl/pancake_aggregation_parser_buckets.go

@@ -115,8 +115,8 @@ func (cw *ClickhouseQueryTranslator) parseDateHistogram(aggregation *pancakeAggr
 	if missingRaw, exists := params["missing"]; exists {
 		if missing, ok := missingRaw.(string); ok {
 			dateManager := NewDateManager(cw.Ctx)
-			if funcName, missingExpr := dateManager.ParseDateUsualFormat(missing, colRef); missingExpr != nil {
-				field = model.NewFunction("COALESCE", field, model.NewFunction(funcName, missingExpr))
+			if missingExpr := dateManager.ParseDateUsualFormat(missing, colRef); missingExpr != nil {
+				field = model.NewFunction("COALESCE", field, missingExpr)
 				weAddedMissing = true
 			} else {
 				logger.ErrorWithCtx(cw.Ctx).Msgf("unknown format of missing in date_histogram: %v. Skipping it.", missing)
@@ -142,7 +142,8 @@ func (cw *ClickhouseQueryTranslator) parseDateHistogram(aggregation *pancakeAggr
 	interval, intervalType := cw.extractInterval(params)
 	// TODO  GetDateTimeTypeFromExpr can be moved and it should take cw.Schema as an argument
 
-	dateHistogram := bucket_aggregations.NewDateHistogram(cw.Ctx, field, colRef, interval, timezone, format, minDocCount, ebMin, ebMax, intervalType)
+	dateHistogram := bucket_aggregations.NewDateHistogram(cw.Ctx,
+		field, colRef, interval, timezone, format, minDocCount, ebMin, ebMax, intervalType)
 	aggregation.queryType = dateHistogram
 
 	columnSql := dateHistogram.GenerateSQL()

platform/parsers/elastic_query_dsl/pancake_sql_query_generation_test.go

@@ -63,10 +63,6 @@ func TestPancakeQueryGeneration(t *testing.T) {
 				t.Skip("works IRL, need to update test's schema. It's already WIP https://github.com/QuesmaOrg/quesma/pull/1255. Let's wait for merge.")
 			}
 
-			if i != 217 {
-				// t.Skip()
-			}
-
 			if filters(test.TestName) {
 				t.Skip("Fix filters")
 			}
@@ -92,10 +88,12 @@ func TestPancakeQueryGeneration(t *testing.T) {
 			assert.NoError(t, err)
 
 			pancakeSqls, err := cw.PancakeParseAggregationJson(jsonp, false)
+			assert.NoError(t, err)
 			for j, pancake := range pancakeSqls {
-				pancakeSqls[j], _ = transformations_delete.ApplyNecessaryTransformations(context.Background(), pancake, &table, currentSchema)
+				pancakeSqls[j], err = transformations_delete.ApplyNecessaryTransformations(context.Background(), pancake, &table, currentSchema)
+				assert.NoError(t, err)
 			}
-			assert.NoError(t, err)
+
 			assert.True(t, len(pancakeSqls) >= 1, "pancakeSqls should have at least one query")
 			if len(pancakeSqls) < 1 {
 				return