Move GetFields from ClickHouseQueryTranslator to Table (#46)

QuesmaOrg · May 6, 2024 · 3fc1f58 · 3fc1f58
1 parent b5b8499
commit 3fc1f58
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/quesma/clickhouse/table.go b/quesma/clickhouse/table.go
@@ -23,6 +23,16 @@ type Table struct {
 	Comment      string // this human-readable comment
 }
 
+func (t *Table) GetFields() []string {
+	var res = make([]string, 0)
+	for _, col := range t.Cols {
+		if col.IsFullTextMatch {
+			res = append(res, col.Name)
+		}
+	}
+	return res
+}
+
 func (t *Table) createTableOurFieldsString() []string {
 	rows := make([]string, 0)
 	if t.Config.hasOthers {

diff --git a/quesma/queryparser/query_parser.go b/quesma/queryparser/query_parser.go
@@ -552,7 +552,7 @@ func (cw *ClickhouseQueryTranslator) parseMultiMatch(queryMap QueryMap) SimpleQu
 			return newSimpleQuery(NewSimpleStatement("invalid fields type"), false)
 		}
 	} else {
-		fields = cw.GetFieldsList()
+		fields = cw.Table.GetFields()
 	}
 	if len(fields) == 0 {
 		return newSimpleQuery(alwaysFalseStatement, true)
@@ -670,7 +670,7 @@ func (cw *ClickhouseQueryTranslator) parseQueryString(queryMap QueryMap) SimpleQ
 	if fieldsRaw, ok := queryMap["fields"]; ok {
 		fields = cw.extractFields(fieldsRaw.([]interface{}))
 	} else {
-		fields = cw.GetFieldsList()
+		fields = cw.Table.GetFields()
 	}
 
 	query := queryMap["query"].(string) // query: (Required, string)
@@ -955,7 +955,7 @@ func (cw *ClickhouseQueryTranslator) extractFields(fields []interface{}) []strin
 			continue
 		}
 		if fieldStr == "*" {
-			return cw.GetFieldsList()
+			return cw.Table.GetFields()
 		}
 		fieldStr = cw.Table.ResolveField(cw.Ctx, fieldStr)
 		result = append(result, fieldStr)

diff --git a/quesma/queryparser/query_translator.go b/quesma/queryparser/query_translator.go
@@ -515,18 +515,6 @@ func SearchToAsyncSearchResponse(searchResponse *model.SearchResp, asyncRequestI
 	return &response
 }
 
-// GetFieldsList
-// TODO flatten tuples, I think (or just don't support them for now, we don't want them at the moment in production schemas)
-func (cw *ClickhouseQueryTranslator) GetFieldsList() []string {
-	var res []string
-	for _, col := range cw.Table.Cols {
-		if col.IsFullTextMatch {
-			res = append(res, col.Name)
-		}
-	}
-	return res
-}
-
 func (cw *ClickhouseQueryTranslator) BuildSelectQuery(fields []string, whereClause string) *model.Query {
 	return &model.Query{
 		Fields:      fields,