Skip to content

Commit

Permalink
correct structonly functionality
Browse files Browse the repository at this point in the history 
- structonly wasn’t behaving correctly when not used with an accompanying struct validation.
  • Loading branch information
Dean Karn authored and Dean Karn committed Dec 7, 2016
1 parent 941ce2c commit 49fccad
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 54 deletions.
108 changes: 54 additions & 54 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package validator
================
<img align="right" src="https://raw.githubusercontent.com/go-playground/validator/v9/logo.png">
[![Join the chat at https://gitter.im/go-playground/validator](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-playground/validator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
![Project status](https://img.shields.io/badge/version-9.3.0-green.svg)
![Project status](https://img.shields.io/badge/version-9.3.1-green.svg)
[![Build Status](https://semaphoreci.com/api/v1/joeybloggs/validator/branches/v9/badge.svg)](https://semaphoreci.com/joeybloggs/validator)
[![Coverage Status](https://coveralls.io/repos/go-playground/validator/badge.svg?branch=v9&service=github)](https://coveralls.io/github/go-playground/validator?branch=v9)
[![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/validator)](https://goreportcard.com/report/github.com/go-playground/validator)
Expand Down Expand Up @@ -66,60 +66,60 @@ Please see http://godoc.org/gopkg.in/go-playground/validator.v9 for detailed usa

Benchmarks
------
###### Run on MacBook Pro (Retina, 15-inch, Late 2013) 2.6 GHz Intel Core i7 16 GB 1600 MHz DDR3 using Go version go1.7.1 darwin/amd64
###### Run on MacBook Pro (Retina, 15-inch, Late 2013) 2.6 GHz Intel Core i7 16 GB 1600 MHz DDR3 using Go version go1.7.4 darwin/amd64
```go
BenchmarkFieldSuccess-8 20000000 106 ns/op
BenchmarkFieldSuccessParallel-8 50000000 33.7 ns/op
BenchmarkFieldFailure-8 5000000 346 ns/op
BenchmarkFieldFailureParallel-8 20000000 115 ns/op
BenchmarkFieldDiveSuccess-8 2000000 739 ns/op
BenchmarkFieldDiveSuccessParallel-8 10000000 246 ns/op
BenchmarkFieldDiveFailure-8 1000000 1043 ns/op
BenchmarkFieldDiveFailureParallel-8 5000000 381 ns/op
BenchmarkFieldCustomTypeSuccess-8 5000000 270 ns/op
BenchmarkFieldCustomTypeSuccessParallel-8 20000000 92.5 ns/op
BenchmarkFieldCustomTypeFailure-8 5000000 331 ns/op
BenchmarkFieldCustomTypeFailureParallel-8 20000000 132 ns/op
BenchmarkFieldOrTagSuccess-8 2000000 874 ns/op
BenchmarkFieldOrTagSuccessParallel-8 5000000 368 ns/op
BenchmarkFieldOrTagFailure-8 3000000 566 ns/op
BenchmarkFieldOrTagFailureParallel-8 5000000 427 ns/op
BenchmarkStructLevelValidationSuccess-8 5000000 335 ns/op
BenchmarkStructLevelValidationSuccessParallel-8 20000000 124 ns/op
BenchmarkStructLevelValidationFailure-8 2000000 630 ns/op
BenchmarkStructLevelValidationFailureParallel-8 10000000 298 ns/op
BenchmarkStructSimpleCustomTypeSuccess-8 3000000 535 ns/op
BenchmarkStructSimpleCustomTypeSuccessParallel-8 10000000 170 ns/op
BenchmarkStructSimpleCustomTypeFailure-8 2000000 821 ns/op
BenchmarkStructSimpleCustomTypeFailureParallel-8 5000000 379 ns/op
BenchmarkStructFilteredSuccess-8 2000000 769 ns/op
BenchmarkStructFilteredSuccessParallel-8 5000000 328 ns/op
BenchmarkStructFilteredFailure-8 2000000 594 ns/op
BenchmarkStructFilteredFailureParallel-8 10000000 244 ns/op
BenchmarkStructPartialSuccess-8 2000000 682 ns/op
BenchmarkStructPartialSuccessParallel-8 5000000 291 ns/op
BenchmarkStructPartialFailure-8 1000000 1034 ns/op
BenchmarkStructPartialFailureParallel-8 5000000 392 ns/op
BenchmarkStructExceptSuccess-8 1000000 1014 ns/op
BenchmarkStructExceptSuccessParallel-8 10000000 257 ns/op
BenchmarkStructExceptFailure-8 2000000 875 ns/op
BenchmarkStructExceptFailureParallel-8 5000000 405 ns/op
BenchmarkStructSimpleCrossFieldSuccess-8 3000000 545 ns/op
BenchmarkStructSimpleCrossFieldSuccessParallel-8 10000000 177 ns/op
BenchmarkStructSimpleCrossFieldFailure-8 2000000 787 ns/op
BenchmarkStructSimpleCrossFieldFailureParallel-8 5000000 341 ns/op
BenchmarkStructSimpleCrossStructCrossFieldSuccess-8 2000000 795 ns/op
BenchmarkStructSimpleCrossStructCrossFieldSuccessParallel-8 10000000 267 ns/op
BenchmarkStructSimpleCrossStructCrossFieldFailure-8 1000000 1119 ns/op
BenchmarkStructSimpleCrossStructCrossFieldFailureParallel-8 3000000 437 ns/op
BenchmarkStructSimpleSuccess-8 5000000 377 ns/op
BenchmarkStructSimpleSuccessParallel-8 20000000 110 ns/op
BenchmarkStructSimpleFailure-8 2000000 785 ns/op
BenchmarkStructSimpleFailureParallel-8 5000000 302 ns/op
BenchmarkStructComplexSuccess-8 1000000 2159 ns/op
BenchmarkStructComplexSuccessParallel-8 2000000 723 ns/op
BenchmarkStructComplexFailure-8 300000 5237 ns/op
BenchmarkStructComplexFailureParallel-8 1000000 2378 ns/op
BenchmarkFieldSuccess-8 20000000 107 ns/op 0 B/op 0 allocs/op
BenchmarkFieldSuccessParallel-8 50000000 33.6 ns/op 0 B/op 0 allocs/op
BenchmarkFieldFailure-8 5000000 333 ns/op 208 B/op 4 allocs/op
BenchmarkFieldFailureParallel-8 20000000 117 ns/op 208 B/op 4 allocs/op
BenchmarkFieldDiveSuccess-8 2000000 766 ns/op 201 B/op 11 allocs/op
BenchmarkFieldDiveSuccessParallel-8 10000000 232 ns/op 201 B/op 11 allocs/op
BenchmarkFieldDiveFailure-8 2000000 1000 ns/op 412 B/op 16 allocs/op
BenchmarkFieldDiveFailureParallel-8 5000000 337 ns/op 413 B/op 16 allocs/op
BenchmarkFieldCustomTypeSuccess-8 5000000 264 ns/op 32 B/op 2 allocs/op
BenchmarkFieldCustomTypeSuccessParallel-8 20000000 83.5 ns/op 32 B/op 2 allocs/op
BenchmarkFieldCustomTypeFailure-8 5000000 343 ns/op 208 B/op 4 allocs/op
BenchmarkFieldCustomTypeFailureParallel-8 20000000 122 ns/op 208 B/op 4 allocs/op
BenchmarkFieldOrTagSuccess-8 2000000 872 ns/op 16 B/op 1 allocs/op
BenchmarkFieldOrTagSuccessParallel-8 3000000 410 ns/op 16 B/op 1 allocs/op
BenchmarkFieldOrTagFailure-8 3000000 569 ns/op 224 B/op 5 allocs/op
BenchmarkFieldOrTagFailureParallel-8 3000000 407 ns/op 224 B/op 5 allocs/op
BenchmarkStructLevelValidationSuccess-8 5000000 268 ns/op 32 B/op 2 allocs/op
BenchmarkStructLevelValidationSuccessParallel-8 20000000 83.3 ns/op 32 B/op 2 allocs/op
BenchmarkStructLevelValidationFailure-8 3000000 567 ns/op 304 B/op 8 allocs/op
BenchmarkStructLevelValidationFailureParallel-8 10000000 204 ns/op 304 B/op 8 allocs/op
BenchmarkStructSimpleCustomTypeSuccess-8 3000000 457 ns/op 32 B/op 2 allocs/op
BenchmarkStructSimpleCustomTypeSuccessParallel-8 10000000 136 ns/op 32 B/op 2 allocs/op
BenchmarkStructSimpleCustomTypeFailure-8 2000000 757 ns/op 424 B/op 9 allocs/op
BenchmarkStructSimpleCustomTypeFailureParallel-8 5000000 310 ns/op 440 B/op 10 allocs/op
BenchmarkStructFilteredSuccess-8 2000000 678 ns/op 288 B/op 9 allocs/op
BenchmarkStructFilteredSuccessParallel-8 10000000 258 ns/op 288 B/op 9 allocs/op
BenchmarkStructFilteredFailure-8 3000000 521 ns/op 256 B/op 7 allocs/op
BenchmarkStructFilteredFailureParallel-8 10000000 197 ns/op 256 B/op 7 allocs/op
BenchmarkStructPartialSuccess-8 2000000 602 ns/op 256 B/op 6 allocs/op
BenchmarkStructPartialSuccessParallel-8 10000000 241 ns/op 256 B/op 6 allocs/op
BenchmarkStructPartialFailure-8 2000000 866 ns/op 480 B/op 11 allocs/op
BenchmarkStructPartialFailureParallel-8 5000000 347 ns/op 480 B/op 11 allocs/op
BenchmarkStructExceptSuccess-8 2000000 955 ns/op 496 B/op 12 allocs/op
BenchmarkStructExceptSuccessParallel-8 10000000 209 ns/op 240 B/op 5 allocs/op
BenchmarkStructExceptFailure-8 2000000 809 ns/op 464 B/op 10 allocs/op
BenchmarkStructExceptFailureParallel-8 5000000 335 ns/op 464 B/op 10 allocs/op
BenchmarkStructSimpleCrossFieldSuccess-8 3000000 469 ns/op 72 B/op 3 allocs/op
BenchmarkStructSimpleCrossFieldSuccessParallel-8 10000000 167 ns/op 72 B/op 3 allocs/op
BenchmarkStructSimpleCrossFieldFailure-8 2000000 714 ns/op 304 B/op 8 allocs/op
BenchmarkStructSimpleCrossFieldFailureParallel-8 5000000 278 ns/op 304 B/op 8 allocs/op
BenchmarkStructSimpleCrossStructCrossFieldSuccess-8 2000000 660 ns/op 80 B/op 4 allocs/op
BenchmarkStructSimpleCrossStructCrossFieldSuccessParallel-8 10000000 244 ns/op 80 B/op 4 allocs/op
BenchmarkStructSimpleCrossStructCrossFieldFailure-8 2000000 939 ns/op 320 B/op 9 allocs/op
BenchmarkStructSimpleCrossStructCrossFieldFailureParallel-8 5000000 382 ns/op 320 B/op 9 allocs/op
BenchmarkStructSimpleSuccess-8 5000000 287 ns/op 0 B/op 0 allocs/op
BenchmarkStructSimpleSuccessParallel-8 20000000 90.5 ns/op 0 B/op 0 allocs/op
BenchmarkStructSimpleFailure-8 2000000 712 ns/op 424 B/op 9 allocs/op
BenchmarkStructSimpleFailureParallel-8 5000000 298 ns/op 424 B/op 9 allocs/op
BenchmarkStructComplexSuccess-8 1000000 1645 ns/op 128 B/op 8 allocs/op
BenchmarkStructComplexSuccessParallel-8 3000000 544 ns/op 128 B/op 8 allocs/op
BenchmarkStructComplexFailure-8 300000 4688 ns/op 3041 B/op 53 allocs/op
BenchmarkStructComplexFailureParallel-8 1000000 2064 ns/op 3041 B/op 53 allocs/op
```

Complimentary Software
Expand Down
6 changes: 6 additions & 0 deletions validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,19 @@ func (v *validate) traverseField(parent reflect.Value, current reflect.Value, ns
if typ != timeType {

if ct != nil {

if ct.typeof == typeStructOnly {
goto CONTINUE
}

ct = ct.next
}

if ct != nil && ct.typeof == typeNoStructLevel {
return
}

CONTINUE:
// if len == 0 then validating using 'Var' or 'VarWithValue'
// Var - doesn't make much sense to do it that way, should call 'Struct', but no harm...
// VarWithField - this allows for validating against each field withing the struct against a specific value
Expand Down
43 changes: 43 additions & 0 deletions validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4391,6 +4391,49 @@ func TestStructOnlyValidation(t *testing.T) {

errs = validate.Struct(outer)
Equal(t, errs, nil)

// Address houses a users address information
type Address struct {
Street string `validate:"required"`
City string `validate:"required"`
Planet string `validate:"required"`
Phone string `validate:"required"`
}

type User struct {
FirstName string `json:"fname"`
LastName string `json:"lname"`
Age uint8 `validate:"gte=0,lte=130"`
Email string `validate:"required,email"`
FavouriteColor string `validate:"hexcolor|rgb|rgba"`
Addresses []*Address `validate:"required"` // a person can have a home and cottage...
Address Address `validate:"structonly"` // a person can have a home and cottage...
}

address := &Address{
Street: "Eavesdown Docks",
Planet: "Persphone",
Phone: "none",
City: "Unknown",
}

user := &User{
FirstName: "",
LastName: "",
Age: 45,
Email: "Badger.Smith@gmail.com",
FavouriteColor: "#000",
Addresses: []*Address{address},
Address: Address{
// Street: "Eavesdown Docks",
Planet: "Persphone",
Phone: "none",
City: "Unknown",
},
}

errs = validate.Struct(user)
Equal(t, errs, nil)
}

func TestGtField(t *testing.T) {
Expand Down

0 comments on commit 49fccad

Please sign in to comment.