From 31a89bfdb3401b48cdb1730f166ce1fdb04068b6 Mon Sep 17 00:00:00 2001
From: Nityananda Gohain <nityanandagohain@gmail.com>
Date: Fri, 31 Mar 2023 11:58:58 +0530
Subject: [PATCH] fix: case sensitive selected field search fixed (#2529)

---
 pkg/query-service/app/logs/parser.go      | 6 +++---
 pkg/query-service/app/logs/parser_test.go | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkg/query-service/app/logs/parser.go b/pkg/query-service/app/logs/parser.go
index 18760ba972..393c418b32 100644
--- a/pkg/query-service/app/logs/parser.go
+++ b/pkg/query-service/app/logs/parser.go
@@ -173,9 +173,9 @@ func parseLogQuery(query string) ([]string, error) {
 			searchString := strings.TrimSpace(strings.Split(v, op)[1])
 
 			operatorRemovedTokens := strings.Split(operatorRegex.ReplaceAllString(v, " "), " ")
-			searchCol := strings.ToLower(operatorRemovedTokens[0])
-			if searchCol == AND || searchCol == OR {
-				searchCol = strings.ToLower(operatorRemovedTokens[1])
+			searchCol := operatorRemovedTokens[0]
+			if strings.ToLower(searchCol) == AND || strings.ToLower(searchCol) == OR {
+				searchCol = operatorRemovedTokens[1]
 			}
 			col := searchCol
 			if strings.ToLower(searchCol) == "fulltext" {
diff --git a/pkg/query-service/app/logs/parser_test.go b/pkg/query-service/app/logs/parser_test.go
index f11419e30f..843de2725c 100644
--- a/pkg/query-service/app/logs/parser_test.go
+++ b/pkg/query-service/app/logs/parser_test.go
@@ -97,6 +97,11 @@ var correctQueriesTest = []struct {
 		`id.userid in (100) and id_userid gt 50`,
 		[]string{`id.userid IN (100) `, `and id_userid > 50 `},
 	},
+	{
+		`filters with case sensitive key name`,
+		`userIdentifier in ('user') and userIdentifier contains 'user'`,
+		[]string{`userIdentifier IN ('user') `, `AND userIdentifier ILIKE '%user%' `},
+	},
 }
 
 func TestParseLogQueryCorrect(t *testing.T) {