- fix predicate extractor

Author: adranwit

internal/inference/state.go

@@ -298,14 +298,24 @@ func (s State) Explicit() State {
 }
 
 func (s State) Expand(text string) string {
+	return s.expand(text, false)
+}
+
+func (s State) ExpandPreserveBuiltins(text string) string {
+	return s.expand(text, true)
+}
+
+func (s State) expand(text string, preserveBuiltins bool) string {
 	expander := data.Map{}
 	if parameters := s.FilterByKind(state.KindConst); len(parameters) > 0 {
 		for _, literal := range parameters {
 			expander[literal.Name] = literal.Value
 		}
 	}
 
-	text = removeBuilinExpr(text)
+	if !preserveBuiltins {
+		text = removeBuilinExpr(text)
+	}
 	return expander.ExpandAsText(text)
 }
 

internal/translator/resource.go

@@ -859,7 +859,7 @@ func (r *Resource) expandSQL(viewlet *Viewlet) (*sqlx.SQL, error) {
 		sourceView.Summary = viewlet
 	}
 
-	sourceSQL = viewlet.Resource.State.Expand(sourceSQL)
+	sourceSQL = viewlet.Resource.State.ExpandPreserveBuiltins(sourceSQL)
 	templateParameters := sqlState.Parameters()
 	if strings.Contains(sourceSQL, "$View.ParentJoinOn") {
 		//TODO adjust parameter value type

internal/translator/service.go

@@ -194,7 +194,7 @@ func (s *Service) buildExecutorView(ctx context.Context, resource *Resource, DSQ
 }
 
 func (s *Service) translateReaderDSQL(ctx context.Context, resource *Resource, dSQL string) error {
-	parseSQL := resource.State.Expand(dSQL)
+	parseSQL := resource.State.ExpandPreserveBuiltins(dSQL)
 	aQuery, err := sqlparser.ParseQuery(parseSQL, parser.OnVeltyExpression())
 	if err != nil {
 		return err