noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update document field checking error messages

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-08-25 15:03:56 +01:00
parent 63d8a71f95
commit 6a97947084
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
util/item/item.go
View file

@ -446,7 +446,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
} }
if fld.Notnull && exists == true && current == nil { if fld.Notnull && exists == true && current == nil {
return fmt.Errorf("Can't be null field '%v'", fld.Name) return fmt.Errorf("Field '%v' can't be null", fld.Name)
} }
if fld.Mandatory && exists == false { if fld.Mandatory && exists == false {
@ -495,7 +495,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
this.current.Set(val, "data", fld.Name) this.current.Set(val, "data", fld.Name)
} else { } else {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to be a email address", fld.Name) return fmt.Errorf("Field '%v' needs to be an email address", fld.Name)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }
@ -517,7 +517,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
this.current.Set(val, "data", fld.Name) this.current.Set(val, "data", fld.Name)
} else { } else {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to be a array", fld.Name) return fmt.Errorf("Field '%v' needs to be an array", fld.Name)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }
@ -528,7 +528,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
this.current.Set(val, "data", fld.Name) this.current.Set(val, "data", fld.Name)
} else { } else {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to be a object", fld.Name) return fmt.Errorf("Field '%v' needs to be an object", fld.Name)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }
@ -663,7 +663,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
case []interface{}: case []interface{}:
if len(now) < int(fld.Min) { if len(now) < int(fld.Min) {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to be have at least %v items", fld.Name, fld.Min) return fmt.Errorf("Field '%v' needs to have at least %v items", fld.Name, fld.Min)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }
@ -672,7 +672,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
case string: case string:
if len(now) < int(fld.Min) { if len(now) < int(fld.Min) {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to at least %v characters", fld.Name, fld.Min) return fmt.Errorf("Field '%v' needs to have at least %v characters", fld.Name, fld.Min)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }
@ -702,7 +702,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
case []interface{}: case []interface{}:
if len(now) > int(fld.Max) { if len(now) > int(fld.Max) {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to be have %v or fewer items", fld.Name, fld.Max) return fmt.Errorf("Field '%v' needs to have %v or fewer items", fld.Name, fld.Max)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }
@ -711,7 +711,7 @@ func (this *Doc) mrgFld(txn kvs.TX) (err error) {
case string: case string:
if len(now) > int(fld.Max) { if len(now) > int(fld.Max) {
if fld.Validate { if fld.Validate {
return fmt.Errorf("Field '%v' needs to be %v or fewer characters", fld.Name, fld.Max) return fmt.Errorf("Field '%v' needs to have %v or fewer characters", fld.Name, fld.Max)
} else { } else {
this.current.Try(initial, "data", fld.Name) this.current.Try(initial, "data", fld.Name)
} }