- fixed multi preficate builders

Author: adranwit

internal/translator/service.go

@@ -194,7 +194,8 @@ func (s *Service) buildExecutorView(ctx context.Context, resource *Resource, DSQ
 }
 
 func (s *Service) translateReaderDSQL(ctx context.Context, resource *Resource, dSQL string) error {
-	aQuery, err := sqlparser.ParseQuery(dSQL, parser.OnVeltyExpression())
+	parseSQL := resource.State.Expand(dSQL)
+	aQuery, err := sqlparser.ParseQuery(parseSQL, parser.OnVeltyExpression())
 	if err != nil {
 		return err
 	}
@@ -206,7 +207,7 @@ func (s *Service) translateReaderDSQL(ctx context.Context, resource *Resource, d
 	if err = s.updateCodecParameters(ctx, resource); err != nil {
 		return err
 	}
-	if err = resource.Rule.Viewlets.Init(ctx, aQuery, resource, s.initReaderViewlet, s.buildQueryViewletType); err != nil {
+	if err = resource.Rule.Viewlets.Init(ctx, aQuery, dSQL, resource, s.initReaderViewlet, s.buildQueryViewletType); err != nil {
 		return err
 	}
 
@@ -586,7 +587,6 @@ func (s *Service) buildQueryViewletType(ctx context.Context, viewlet *Viewlet) e
 }
 
 func (s *Service) buildViewletType(ctx context.Context, db *sql.DB, viewlet *Viewlet) (err error) {
-
 	shared.EnsureArgs(viewlet.Expanded.Query, &viewlet.Expanded.Args)
 	viewlet.Spec, err = inference.NewSpec(ctx, db, &s.Repository.Messages, viewlet.Table.Name, viewlet.ColumnConfig, viewlet.Expanded.Query, viewlet.Expanded.Args...)
 	if err != nil {

internal/translator/view.go

@@ -251,8 +251,8 @@ func (v *View) buildTemplate(namespace *Viewlet, rule *Rule) {
 	isRoot := rule.Root == v.Name
 	resource := namespace.Resource
 	v.EnsureTemplate()
-	v.Template.Source = namespace.SanitizedSQL
-	v.Template.Parameters = v.matchParameters(namespace.SanitizedSQL, resource.State, isRoot)
+	v.Template.Source = namespace.SQL
+	v.Template.Parameters = v.matchParameters(namespace.SQL, resource.State, isRoot)
 }
 
 // matchParameters matches parameter used by SQL, and add explicit parameter for root view

internal/translator/viewlets.go

@@ -42,12 +42,15 @@ func (n *Viewlets) Append(viewlet *Viewlet) {
 	n.registry[viewlet.Name] = viewlet
 	n.keys = append(n.keys, viewlet.Name)
 }
-func (n *Viewlets) Init(ctx context.Context, aQuery *query.Select, resource *Resource, initFn, setType func(ctx context.Context, n *Viewlet) error) error {
+func (n *Viewlets) Init(ctx context.Context, aQuery *query.Select, rootSQL string, resource *Resource, initFn, setType func(ctx context.Context, n *Viewlet) error) error {
 
 	SQL, err := SafeQueryStringify(aQuery)
 	if err != nil {
 		return err
 	}
+	if extracted := extractRootViewletSQL(rootSQL, aQuery.From.Alias); extracted != "" {
+		SQL = extracted
+	}
 	root := NewViewlet(aQuery.From.Alias, SQL, nil, resource)
 	root.ViewJSONHint = aQuery.From.Comments
 	if root.ViewJSONHint == "" && aQuery.From.X != nil {
@@ -123,6 +126,51 @@ func SafeQueryStringify(aQuery *query.Select) (SQL string, err error) {
 	return SQL, err
 }
 
+func extractRootViewletSQL(SQL, alias string) string {
+	SQL = strings.TrimSpace(SQL)
+	alias = strings.TrimSpace(alias)
+	if SQL == "" || alias == "" {
+		return ""
+	}
+	lowerSQL := strings.ToLower(SQL)
+	lowerAlias := strings.ToLower(alias)
+	aliasPos := strings.LastIndex(lowerSQL, lowerAlias)
+	if aliasPos == -1 {
+		return ""
+	}
+	closePos := aliasPos - 1
+	for closePos >= 0 {
+		switch SQL[closePos] {
+		case ' ', '\n', '\t', '\r':
+			closePos--
+			continue
+		case ')':
+			goto scan
+		default:
+			return ""
+		}
+	}
+	return ""
+
+scan:
+	if closePos < 0 {
+		return ""
+	}
+	depth := 1
+	for i := closePos - 1; i >= 0; i-- {
+		switch SQL[i] {
+		case ')':
+			depth++
+		case '(':
+			depth--
+			if depth == 0 {
+				return strings.TrimSpace(SQL[i : closePos+1])
+			}
+		}
+	}
+	return ""
+}
+
 func (n *Viewlets) applyViewHintSettings() error {
 	return n.Each(func(namespace *Viewlet) error {
 		return namespace.View.applyHintSettings(namespace)