Add used functions, parameters, datetimeLiterals to meta info

Author: shellyln

soql/parser/postprocess/normalize.go

@@ -21,6 +21,9 @@ type normalizeQueryContext struct {
 	maxViewDepth       int
 	queryGraph         map[int]SoqlQueryGraphLeaf
 	viewGraph          map[int]SoqlViewGraphLeaf
+	functions          map[string]struct{}
+	parameters         map[string]struct{}
+	dateTimeLiterals   map[string]struct{}
 }
 
 func (ctx *normalizeQueryContext) normalizeQuery(
@@ -328,8 +331,6 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		}
 	}
 
-	// TODO: Associate with schema.
-
 	if err := ctx.buildPerObjectInfo(q); err != nil {
 		return err
 	}
@@ -354,6 +355,13 @@ func (ctx *normalizeQueryContext) normalizeQuery(
 		}
 	}
 
+	if q.OffsetAndLimit.OffsetParamName != "" {
+		ctx.parameters[q.OffsetAndLimit.OffsetParamName] = struct{}{}
+	}
+	if q.OffsetAndLimit.LimitParamName != "" {
+		ctx.parameters[q.OffsetAndLimit.LimitParamName] = struct{}{}
+	}
+
 	savedViewIdMap := ctx.viewIdMap
 	savedColumnIdMap := ctx.columnIdMap
 	savedColIndexMap := ctx.colIndexMap
@@ -426,6 +434,9 @@ func Normalize(q *SoqlQuery) error {
 		maxViewDepth:       0,
 		queryGraph:         make(map[int]SoqlQueryGraphLeaf),
 		viewGraph:          make(map[int]SoqlViewGraphLeaf),
+		functions:          make(map[string]struct{}),
+		parameters:         make(map[string]struct{}),
+		dateTimeLiterals:   make(map[string]struct{}),
 	}
 
 	if err := ctx.normalizeQuery(soqlQueryPlace_Primary, q, nil, 1, nil); err != nil {
@@ -439,6 +450,9 @@ func Normalize(q *SoqlQuery) error {
 	q.Meta.MaxViewDepth = ctx.maxViewDepth
 	q.Meta.QueryGraph = ctx.queryGraph
 	q.Meta.ViewGraph = ctx.viewGraph
+	q.Meta.Functions = ctx.functions
+	q.Meta.Parameters = ctx.parameters
+	q.Meta.DateTimeLiterals = ctx.dateTimeLiterals
 
 	return nil
 }

soql/parser/postprocess/normalize1.go

@@ -166,6 +166,7 @@ func (ctx *normalizeQueryContext) normalizeFieldName(
 			if len(field.Name) == 1 {
 				funcName = strings.ToLower(field.Name[0])
 			}
+			ctx.functions[strings.ToLower(funcName)] = struct{}{}
 
 			if conf.isFunctionParameter {
 				// Check function names not allowed in nested
@@ -318,6 +319,10 @@ func (ctx *normalizeQueryContext) normalizeFieldName(
 				"The fields() is not allowed in conditional clause or function parameter: " +
 					strings.Join(field.Name, "."))
 		}
+	case SoqlFieldInfo_ParameterizedValue:
+		ctx.parameters[strings.ToLower(field.Name[0])] = struct{}{}
+	case SoqlFieldInfo_DateTimeLiteralName:
+		ctx.dateTimeLiterals[strings.ToLower(field.Name[0])] = struct{}{}
 	}
 
 	return nil

soql/parser/types/types.go

@@ -256,18 +256,20 @@ type SoqlQueryGraphLeaf struct {
 }
 
 type SoqlQueryMeta struct {
-	Version       string                     `json:"version,omitempty"`       // format version
-	Date          time.Time                  `json:"date,omitempty"`          // compiled datetime
-	ElapsedTime   time.Duration              `json:"elapsedTime,omitempty"`   // time taken to compile
-	Source        string                     `json:"source,omitempty"`        // source
-	MaxQueryDepth int                        `json:"maxQueryDepth,omitempty"` // max depth of query graph
-	MaxViewDepth  int                        `json:"maxViewDepth,omitempty"`  // max depth of object graph
-	NextQueryId   int                        `json:"nextQueryId,omitempty"`   // next query id (a number of queries)
-	NextViewId    int                        `json:"nextViewId,omitempty"`    // next view id (a number of views)
-	NextColumnId  int                        `json:"nextColumnId,omitempty"`  // next column id (a number of columns)
-	QueryGraph    map[int]SoqlQueryGraphLeaf `json:"queryGraph,omitempty"`    // query graph (child -> parent)
-	ViewGraph     map[int]SoqlViewGraphLeaf  `json:"viewGraph,omitempty"`     // object graph (child -> parent)
-	// TODO: Parameters, DateTimeLiterals
+	Version          string                     `json:"version,omitempty"`          // format version
+	Date             time.Time                  `json:"date,omitempty"`             // compiled datetime
+	ElapsedTime      time.Duration              `json:"elapsedTime,omitempty"`      // time taken to compile
+	Source           string                     `json:"source,omitempty"`           // source
+	MaxQueryDepth    int                        `json:"maxQueryDepth,omitempty"`    // max depth of query graph
+	MaxViewDepth     int                        `json:"maxViewDepth,omitempty"`     // max depth of object graph
+	NextQueryId      int                        `json:"nextQueryId,omitempty"`      // next query id (a number of queries)
+	NextViewId       int                        `json:"nextViewId,omitempty"`       // next view id (a number of views)
+	NextColumnId     int                        `json:"nextColumnId,omitempty"`     // next column id (a number of columns)
+	QueryGraph       map[int]SoqlQueryGraphLeaf `json:"queryGraph,omitempty"`       // query graph (child -> parent)
+	ViewGraph        map[int]SoqlViewGraphLeaf  `json:"viewGraph,omitempty"`        // object graph (child -> parent)
+	Functions        map[string]struct{}        `json:"functions,omitempty"`        // functions
+	Parameters       map[string]struct{}        `json:"parameters,omitempty"`       // parameters
+	DateTimeLiterals map[string]struct{}        `json:"dateTimeLiterals,omitempty"` // datetime literals
 }
 
 type SoqlQuery struct {