Merge pull request #851 from Altinity/commit-missing-files

Commit missing changes

Author: Slach

pkg/eval/eval_query.go

@@ -2440,5 +2440,6 @@ func NewEvalQuery(request interface{}, from, to time.Time) EvalQuery {
 		To:                     to,
 		FrontendDatasource:     v.FieldByName("FrontendDatasource").Bool(),
 		UseWindowFuncForMacros: v.FieldByName("UseWindowFuncForMacros").Bool(),
+		MetadataUserLogin:      v.FieldByName("MetadataUserLogin").String(),
 	}
 }

pkg/resource_handlers.go

@@ -17,16 +17,15 @@ import (
 
 // Request/Response structures for resource handlers
 
-
 type Target struct {
 	Database string `json:"database"`
 	Table    string `json:"table"`
 }
 
 type ApplyAdhocFiltersRequest struct {
-	Query        string               `json:"query"`
+	Query        string              `json:"query"`
 	AdhocFilters []adhoc.AdhocFilter `json:"adhocFilters"`
-	Target       Target               `json:"target"`
+	Target       Target              `json:"target"`
 }
 
 type ApplyAdhocFiltersResponse struct {
@@ -54,6 +53,7 @@ type CreateQueryRequest struct {
 	MaxDataPoints          int64  `json:"maxDataPoints"`
 	FrontendDatasource     bool   `json:"frontendDatasource"`
 	UseWindowFuncForMacros bool   `json:"useWindowFuncForMacros"`
+	MetadataUserLogin      string `json:"metadataUserLogin"`
 	TimeRange              struct {
 		From string `json:"from"`
 		To   string `json:"to"`
@@ -112,14 +112,15 @@ type ProcessQueryBatchRequest struct {
 	MaxDataPoints          int64  `json:"maxDataPoints"`
 	FrontendDatasource     bool   `json:"frontendDatasource"`
 	UseWindowFuncForMacros bool   `json:"useWindowFuncForMacros"`
+	MetadataUserLogin      string `json:"metadataUserLogin"`
 	TimeRange              struct {
 		From string `json:"from"`
 		To   string `json:"to"`
 	} `json:"timeRange"`
 
 	// Adhoc filter fields
 	AdhocFilters []adhoc.AdhocFilter `json:"adhocFilters"`
-	Target       Target        `json:"target"`
+	Target       Target              `json:"target"`
 
 	// Properties to extract
 	ExtractProperties []string `json:"extractProperties"`
@@ -164,14 +165,15 @@ type CreateQueryWithAdhocRequest struct {
 	MaxDataPoints          int64  `json:"maxDataPoints"`
 	FrontendDatasource     bool   `json:"frontendDatasource"`
 	UseWindowFuncForMacros bool   `json:"useWindowFuncForMacros"`
+	MetadataUserLogin      string `json:"metadataUserLogin"`
 	TimeRange              struct {
 		From string `json:"from"`
 		To   string `json:"to"`
 	} `json:"timeRange"`
 
 	// Adhoc filter fields
 	AdhocFilters []adhoc.AdhocFilter `json:"adhocFilters"`
-	Target       Target        `json:"target"`
+	Target       Target              `json:"target"`
 }
 
 type CreateQueryWithAdhocResponse struct {
@@ -252,8 +254,6 @@ func findGroupByProperties(ast *eval.EvalAST) []interface{} {
 	return []interface{}{}
 }
 
-
-
 // handleCreateQuery processes query creation with macro expansion and time range handling
 func (ds *ClickHouseDatasource) handleCreateQuery(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	request, ok := requests.UnmarshalRequest[CreateQueryRequest](req, sender)
@@ -914,7 +914,6 @@ func sendUniversalErrorResponse(sender backend.CallResourceResponseSender, ctx E
 	})
 }
 
-
 // handleCreateQueryWithAdhoc safely batches createQuery + applyAdhocFilters without property extraction
 func (ds *ClickHouseDatasource) handleCreateQueryWithAdhoc(ctx context.Context, req *backend.CallResourceRequest, sender backend.CallResourceResponseSender) error {
 	var request CreateQueryWithAdhocRequest