scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-06 19:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

require fields and frames in definition

Browse source
This commit is contained in:
Michael Baird 2017-06-29 08:50:53 -05:00
parent 6028b50b06
commit 3e2bbc3717
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
input_definition.go
View file

@ -247,7 +247,7 @@ func (i *InputFrame) Validate() error {
if err := ValidateName(i.Name); err != nil {
return err
}
// TODO frame option validation
return nil
}
@ -270,15 +270,14 @@ func (i *InputDefinitionInfo) Validate(columnLabel string) error {
numPrimaryKey := 0
accountRowID := make(map[string]uint64)
if len(i.Frames) == 0 {
return fmt.Errorf("At least one frame is required per Input Definition")
if len(i.Frames) == 0 || len(i.Fields) == 0 {
return ErrInputDefinitionAttrsRequired
}
for _, frame := range i.Frames {
if err := frame.Validate(); err != nil {
return err
}
// TODO frame option validation
}
// Validate columnLabel and duplicate primaryKey.
@ -293,7 +292,7 @@ func (i *InputDefinitionInfo) Validate(columnLabel string) error {
if err := action.Validate(); err != nil {
return err
}
if action.ValueDestination == InputSingleRowBool && action.Frame != "" {
if action.ValueDestination == InputSingleRowBool {
if action.RowID == nil {
return fmt.Errorf("rowID required for single-row-boolean Field %s", field.Name)
}
@ -305,13 +304,13 @@ func (i *InputDefinitionInfo) Validate(columnLabel string) error {
}
}
}
if len(i.Fields) > 0 && numPrimaryKey == 0 {
return ErrInputDefinitionHasPrimaryKey
}
if numPrimaryKey > 1 {
return ErrInputDefinitionDupePrimaryKey
}
return nil
}

2
input_definition_test.go
View file

@ -110,7 +110,7 @@ func TestActionValidation(t *testing.T) {
field := pilosa.InputDefinitionField{Name: "id", PrimaryKey: false, Actions: []pilosa.Action{action}}
info := pilosa.InputDefinitionInfo{Fields: []pilosa.InputDefinitionField{field}}
err := info.Validate("id")
if !strings.Contains(err.Error(), "one frame is required per Input Definition") {
if err != pilosa.ErrInputDefinitionAttrsRequired {
t.Fatalf("Expected frame required error, actual error: %s", err)
}