Merge branch 'master' of https://github.com/viant/datly

internal/inference/state.go

@@ -93,7 +93,7 @@ func (s State) Parameters() state.Parameters {
 }
 
 func (s State) Compact(modulePath string) (State, error) {
- if err := s.EnsureReflectTypes(modulePath); err != nil {
+ if err := s.EnsureReflectTypes(modulePath, ""); err != nil {
  return nil, err
  }
  var result = State{}
@@ -406,8 +406,7 @@ func (s State) ReflectType(pkgPath string, lookupType xreflect.LookupType) (refl
  return baseType, nil
 }
 
-func (s State) EnsureReflectTypes(modulePath string) error {
- typeRegistry := xreflect.NewTypes(xreflect.WithPackagePath(modulePath), xreflect.WithRegistry(extension.Config.Types))
+func (s State) EnsureStructQLTypes() error {
  for _, param := range s {
  if param.Schema == nil {
  continue
@@ -416,17 +415,43 @@ func (s State) EnsureReflectTypes(modulePath string) error {
  continue
  }
  if param.In.Kind == state.KindParam {
- sourceParam := s.Lookup(param.In.Name)
- if sourceParam == nil {
- return fmt.Errorf("failed to lookup param parameter: %v", param.In.Name)
+ if err := s.enureStructQLType(param); err != nil {
+ return err
  }
- if param.SQL != "" {
- query, err := structql.NewQuery(param.SQL, sourceParam.Schema.Type(), nil)
- if err != nil {
- return fmt.Errorf("failed to queryql param %v from %s(%s) due to: %w", param.Name, param.In.Name, sourceParam.Schema.Type().String(), err)
- }
- param.Schema = state.NewSchema(query.StructType())
- param.Schema.DataType = param.Name
+ continue
+ }
+ }
+ return nil
+}
+
+func (s State) enureStructQLType(param *Parameter) error {
+ sourceParam := s.Lookup(param.In.Name)
+ if sourceParam == nil {
+ return fmt.Errorf("failed to lookup param parameter: %v", param.In.Name)
+ }
+ if param.SQL != "" {
+ query, err := structql.NewQuery(param.SQL, sourceParam.Schema.Type(), nil)
+ if err != nil {
+ return fmt.Errorf("failed to queryql %v param %v from %s(%s) due to: %w", param.SQL, param.Name, param.In.Name, sourceParam.Schema.Type().String(), err)
+ }
+ param.Schema = state.NewSchema(query.StructType())
+ param.Schema.DataType = param.Name
+ }
+ return nil
+}
+
+func (s State) EnsureReflectTypes(modulePath string, pkg string) error {
+ typeRegistry := xreflect.NewTypes(xreflect.WithPackagePath(modulePath), xreflect.WithRegistry(extension.Config.Types))
+ for _, param := range s {
+ if param.Schema == nil {
+ continue
+ }
+ if param.Schema.Type() != nil {
+ continue
+ }
+ if param.In.Kind == state.KindParam {
+ if err := s.enureStructQLType(param); err != nil {
+ return err
  }
  continue
  }
@@ -441,7 +466,10 @@ func (s State) EnsureReflectTypes(modulePath string) error {
  }
  rType, err := types.LookupType(typeRegistry.Lookup, dataType, xreflect.WithPackage(param.Schema.Package))
  if err != nil {
- return err
+ rType, err = types.LookupType(typeRegistry.Lookup, dataType, xreflect.WithPackage(pkg))
+ if err != nil {
+ return err
+ }
  }
  param.Schema.SetType(rType)
  }

internal/translator/output.go

@@ -47,7 +47,7 @@ func (s *Service) updateOutputParameters(resource *Resource, rootViewlet *Viewle
  }
  }
 
- if err = resource.OutputState.EnsureReflectTypes(resource.rule.ModuleLocation); err != nil {
+ if err = resource.OutputState.EnsureReflectTypes(resource.rule.ModuleLocation, resource.rule.Package()); err != nil {
  return err
  }
 

internal/translator/resource.go

@@ -340,7 +340,10 @@ func (r *Resource) extractRuleSetting(dSQL *string) error {
 func (r *Resource) expandSQL(viewlet *Viewlet) (*sqlx.SQL, error) {
  types := viewlet.Resource.Resource.TypeRegistry()
  resourceState := viewlet.Resource.State
- _ = resourceState.EnsureReflectTypes(r.rule.GoModuleLocation())
+ err := resourceState.EnsureStructQLTypes()
+ if err != nil {
+ return nil, err
+ }
  sqlState := viewlet.Resource.State.StateForSQL(viewlet.SQL, r.Rule.Root == viewlet.Name)
  metaViewSQL := sqlState.MetaViewSQL()
  compacted, err := sqlState.Compact(r.rule.ModuleLocation)

service/executor/sequencer/service.go

@@ -3,6 +3,7 @@ package sequencer
 import (
  "context"
  "database/sql"
+ "fmt"
  "github.com/viant/sqlx/io/insert"
  "github.com/viant/sqlx/metadata/info/dialect"
  "strings"
@@ -14,6 +15,14 @@ type Service struct {
 }
 
 func (s *Service) Next(table string, any interface{}, selector string) error {
+ err := s.next(table, any, selector)
+ if err != nil {
+ return fmt.Errorf("failed to allocate %v sequence due to: %w", table, err)
+ }
+ return nil
+}
+
+func (s *Service) next(table string, any interface{}, selector string) error {
  parts := strings.Split(selector, "/")
  aWalker, err := NewWalker(any, parts)
  if err != nil {

service/reader/service.go

@@ -153,6 +153,7 @@ func (s *Service) readAll(ctx context.Context, session *Session, collector *view
  relationGroup.Wait()
  ptr, xslice := collector.Slice()
  for i := 0; i < xslice.Len(ptr); i++ {
+
  if actual, ok := xslice.ValuePointerAt(ptr, i).(OnRelationer); ok {
  actual.OnRelation(ctx)
  continue

view/extension/codec/structql.go

@@ -54,9 +54,8 @@ func (s *StructQLCodec) evaluateQuery() (*structql.Query, error) {
  }
  query, err := structql.NewQuery(s.query, s.ownerType, nil)
  if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to evaludate structql codec: %w", err)
  }
-
  s._query = query
  return query, nil
 }

view/view.go

@@ -1527,6 +1527,7 @@ func (v *View) SetParameter(name string, selectors *State, value interface{}) er
 }
 
 func (v *View) BuildParametrizedSQL(aState state.Parameters, types *xreflect.Types, SQL string, bindingArgs []interface{}, options ...expand2.StateOption) (*sqlx.SQL, error) {
+
  reflectType, err := aState.ReflectType(pkgPath, types.Lookup, state.WithSetMarker())
  if err != nil {
  return nil, fmt.Errorf("failed to create aState %v type: %w", v.Name, err)