patched column duplication

internal/translator/discovery.go

@@ -177,18 +177,18 @@ func (s *Service) detectColumns(resource *Resource, columnDiscovery discover.Col
  return nil
  }
  if columns := viewlet.Spec.Columns; len(columns) > 0 {
- viewlet.Columns = view.NewColumns(columns)
+ viewlet.Columns = view.NewColumns(columns).Dedupe()
  isValid := s.ensureValidColumns(viewlet)
  if isValid && !viewlet.IsSummary {
- columnDiscovery.Items[viewlet.Name] = viewlet.Columns
+ columnDiscovery.Items[viewlet.Name] = viewlet.Columns.Dedupe()
  }
  summary := viewlet.Summary
  if summary != nil && len(summary.Spec.Columns) > 0 {
  if len(summary.Columns) == 0 {
- summary.Columns = view.NewColumns(summary.Spec.Columns)
+ summary.Columns = view.NewColumns(summary.Spec.Columns).Dedupe()
  }
  key := view.SummaryViewKey(viewlet.View.Name, summary.View.Name)
- columnDiscovery.Items[key] = summary.Columns
+ columnDiscovery.Items[key] = summary.Columns.Dedupe()
  }
  }
  s.updateViewOutputType(viewlet, true, resource.Rule.Doc.Columns)

view/column.go

@@ -238,6 +238,10 @@ type (
  NamedColumnConfig map[string]*ColumnConfig
 )
 
+func (c *ColumnConfig) IgnoreColumn() bool {
+ return c.Tag != nil && strings.Contains(*c.Tag, `sqlx:"-"`)
+}
+
 func (c ColumnConfigs) Index() NamedColumnConfig {
  var result = make(map[string]*ColumnConfig)
  for _, item := range c {

view/columns.go

@@ -30,6 +30,19 @@ func (c Columns) Index(formatCase text.CaseFormat) NamedColumns {
  return result
 }
 
+func (c Columns) Dedupe() Columns {
+ var unique = make(map[string]*Column)
+ var result Columns
+ for i := range c {
+ if _, ok := unique[c[i].Name]; ok {
+ continue
+ }
+ unique[c[i].Name] = c[i]
+ result = append(result, c[i])
+ }
+ return result
+}
+
 // NamedColumns represents *Column registry.
 type NamedColumns map[string]*Column