From a486af574941da8302d32ce841abf6d932f02d92 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Fri, 23 May 2025 10:53:07 +0200 Subject: [PATCH] feat(product_analytics): general query fix --- backend/pkg/analytics/charts/metric_table.go | 6 +++--- backend/pkg/analytics/charts/query.go | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/pkg/analytics/charts/metric_table.go b/backend/pkg/analytics/charts/metric_table.go index 2927e062f..a456fa0ca 100644 --- a/backend/pkg/analytics/charts/metric_table.go +++ b/backend/pkg/analytics/charts/metric_table.go @@ -49,10 +49,10 @@ var propertySelectorMap = map[string]string{ } var mainColumns = map[string]string{ - "userBrowser": "main.$browser", + "userBrowser": "$browser", "userDevice": "sessions.user_device", - "referrer": "main.$referrer", - "ISSUE": "main.issue_type", + "referrer": "$referrer", + "ISSUE": "issue_type", } func (t TableQueryBuilder) Execute(p Payload, conn db.Connector) (interface{}, error) { diff --git a/backend/pkg/analytics/charts/query.go b/backend/pkg/analytics/charts/query.go index e28771e95..4d42469d5 100644 --- a/backend/pkg/analytics/charts/query.go +++ b/backend/pkg/analytics/charts/query.go @@ -78,8 +78,10 @@ func getColumnAccessor(logical string, isNumeric bool, opts BuildConditionsOptio if col, ok := opts.DefinedColumns[logical]; ok { col = quote(col) if opts.MainTableAlias != "" { - //return fmt.Sprintf("%s.%s", opts.MainTableAlias, col) - return fmt.Sprintf("%s", col) + if strings.Contains(col, ".") { + return fmt.Sprintf("%s", col) + } + return fmt.Sprintf("%s.%s", opts.MainTableAlias, col) } return col }