updated converter

config/predicates.go

@@ -98,11 +98,11 @@ func NewNotInPredicate() *predicate.Template {
 }
 
 func newInPredicate(name string, equal bool) *predicate.Template {
-	column := "${Alias}.${ColumnName}"
-	in := fmt.Sprintf("$criteria.In(%v, $FilterValue)", column)
+	column := `${Alias} + "." + ${ColumnName}`
+	in := fmt.Sprintf(`$criteria.In(%v, $FilterValue)`, column)
 
 	if !equal {
-		in = fmt.Sprintf("$criteria.NotIn(%v, $FilterValue)", column)
+		in = fmt.Sprintf(`$criteria.NotIn(%v, $FilterValue)`, column)
 	}
 
 	return &predicate.Template{

converter/converter.go

@@ -3,6 +3,7 @@ package converter
 import (
 	"context"
 	"encoding/json"
+	"github.com/viant/toolbox"
 	"github.com/viant/xreflect"
 	"reflect"
 	"strconv"
@@ -174,8 +175,12 @@ func Convert(raw string, toType reflect.Type, skipValidation bool, format string
 				format = time.RFC3339
 			}
 
-			asTime, err := time.Parse(format, raw)
-			return asTime, false, err
+			asTime, err := toolbox.ToTime(raw, format)
+			if err != nil {
+				return nil, false, err
+			}
+
+			return *asTime, false, nil
 		}
 	}
 

e2e/local/regression/cases/064_custom_predicates/templates.yaml

@@ -1,4 +1,4 @@
-Templates:
+Predicates:
   - Name: "price_range"
     Args:
       - Name:  "Alias"

e2e/local/regression/cases/065_params_group/templates.yaml

@@ -1,4 +1,4 @@
-Templates:
+Predicates:
   - Name: "custom_range"
     Args:
       - Name:  "Alias"

utils/types/accessors.go

@@ -251,7 +251,8 @@ func (a *Accessor) adjustAndSet(ptr unsafe.Pointer, value interface{}, format st
 		return nil, err
 	}
 
-	converted, _, err := converter.Convert(string(marshal), xField.Type, false, format)
+	raw := string(marshal)
+	converted, _, err := converter.Convert(raw, xField.Type, false, format)
 	if err != nil {
 		return nil, err
 	}

view/resource.go

@@ -54,8 +54,8 @@ type Resource struct {
 	_visitors config.CodecsRegistry
 	ModTime   time.Time `json:",omitempty"`
 
-	Templates  []*predicate.Template
-	_templates *config.PredicateRegistry
+	Predicates  []*predicate.Template
+	_predicates *config.PredicateRegistry
 
 	_columnsCache map[string]Columns
 
@@ -668,34 +668,34 @@ func (r *Resource) mergeMessageBuses(resource *Resource) {
 
 func (r *Resource) initTemplates(registry *config.PredicateRegistry) error {
 	if registry != nil {
-		r._templates = registry.Scope()
+		r._predicates = registry.Scope()
 	}
 
 	r.ensureTemplatesIndex()
 
-	for _, template := range r.Templates {
-		r._templates.Add(template)
+	for _, template := range r.Predicates {
+		r._predicates.Add(template)
 	}
 
 	return nil
 }
 
 func (r *Resource) ensureTemplatesIndex() {
-	if r._templates == nil {
-		r._templates = config.NewPredicates()
+	if r._predicates == nil {
+		r._predicates = config.NewPredicates()
 	}
 }
 
 func (r *Resource) mergeTemplates(resource *Resource) {
 	r.ensureTemplatesIndex()
-	for _, template := range resource.Templates {
+	for _, template := range resource.Predicates {
 		r.addTemplate(template)
 	}
 }
 
 func (r *Resource) addTemplate(template *predicate.Template) {
-	r.Templates = append(r.Templates, template)
-	r._templates.Add(template)
+	r.Predicates = append(r.Predicates, template)
+	r._predicates.Add(template)
 }
 
 func (r *Resource) expandStringField(value reflect.Value) error {

view/template.go

@@ -334,7 +334,7 @@ func (t *Template) initSqlEvaluator(resource *Resource) error {
 	var predicates []*expand.PredicateConfig
 	for _, p := range t.Parameters {
 		for _, predicate := range p.Predicates {
-			evaluator, err := cache.get(predicate, p, resource._templates, t.PresenceSchema.Type())
+			evaluator, err := cache.get(predicate, p, resource._predicates, t.PresenceSchema.Type())
 			if err != nil {
 				return err
 			}