updated abiltiy to use custom type on relation

cmd/command/generate.go

@@ -294,7 +294,6 @@ func (s *Service) buildHandlerIfNeeded(ruleOptions *options.Rule, dSQL *string)
  }
  handlerDSQL += fmt.Sprintf("$Nop($%v)", name)
  *dSQL = handlerDSQL
- *dSQL = handlerDSQL
  return nil
 }
 

internal/inference/spec.go

@@ -162,7 +162,7 @@ func (s *Spec) AddRelation(name string, join *query.Join, spec *Spec, cardinalit
  for _, item := range s.Type.columnFields {
  available = append(available, item.Column.Name)
  }
- return fmt.Errorf("failed to rel field for %v, available: %v", relColumn, available)
+ return fmt.Errorf("failed to match rel field for %v, available: %v %v", relColumn, s.Type.Name, available)
  }
 
  keyField := spec.Type.ByColumn(refColumn)

internal/translator/discovery.go

@@ -104,13 +104,13 @@ func (s *Service) updateViewSchema(aView *view.View, resource *Resource, cache d
  relViewlet := resource.Rule.Viewlets.Lookup(rel.Of.View.Ref)
  relView := &relViewlet.View.View
  relSchema := relView.Schema
+ relView.SetResource(aView.GetResource())
+ rel.Of.View = *relView
+ relations = append(relations, rel)
  if relSchema != nil && relSchema.Name != "" { //used has defined custom type, skip generation
  continue
  }
  relSchema.Name = view.DefaultTypeName(relSchema.Name)
- relView.SetResource(aView.GetResource())
- rel.Of.View = *relView
- relations = append(relations, rel)
  if err = s.updateViewSchema(relView, resource, cache, registry, types, doc); err != nil {
  return err
  }

view/column/discover.go

@@ -218,10 +218,13 @@ func readSinkColumns(ctx context.Context, db *sql.DB, table string) ([]sink.Colu
  if err != nil {
  return nil, err
  }
- columns, err := config.Columns(ctx, session, db, table)
+ columns, vErr := config.Columns(ctx, session, db, table)
  if len(columns) == 0 && table != "" {
  columns, err = inferColumnWithSQL(ctx, db, "SELECT * FROM "+table+" WHERE 1 = 0", []interface{}{}, map[string]sink.Column{})
  }
+ if len(columns) == 0 {
+ return nil, vErr
+ }
  return columns, err
 }