Skip to content

excluded_unless bug fix #1307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

excluded_unless bug fix #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions baked_in.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,11 +1905,12 @@ func excludedUnless(fl FieldLevel) bool {
panic(fmt.Sprintf("Bad param number for excluded_unless %s", fl.FieldName()))
}
for i := 0; i < len(params); i += 2 {
if !requireCheckFieldValue(fl, params[i], params[i+1], false) {
return !hasValue(fl)
if requireCheckFieldValue(fl, params[i], params[i+1], false) {
return true
}
}
return true

return !hasValue(fl)
}

// excludedWith is the validation function
Expand Down
38 changes: 38 additions & 0 deletions validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11140,6 +11140,24 @@ func TestRequiredUnless(t *testing.T) {
Inner: &Inner{Field: &fieldVal},
}
_ = validate.Struct(test3)

test4 := struct {
Field1 int
Field2 string `validate:"required_unless: Field1 1 Field1 2"`
Field3 int
Field4 string `validate:"required_unless: Field3 1 Field3 2"`
}{
Field1: 1,
Field3: 3,
}

errs = validate.Struct(test4)
NotEqual(t, errs, nil)

ve = errs.(ValidationErrors)
Equal(t, len(ve), 1)

AssertError(t, errs, "Field2", "Field2", "Field2", "Field2", "required_unless")
}

func TestSkipUnless(t *testing.T) {
Expand Down Expand Up @@ -12126,6 +12144,26 @@ func TestExcludedUnless(t *testing.T) {
Inner: &Inner{Field: &fieldVal},
}
_ = validate.Struct(panicTest)

test9 := struct {
Field1 int
Field2 string `validate:"excluded_unless: Field1 1 Field1 2"`
Field3 int
Field4 string `validate:"excluded_unless: Field3 1 Field3 2"`
}{
Field1: 1,
Field2: "foo",
Field3: 3,
Field4: "foo",
}

errs = validate.Struct(test9)
NotEqual(t, errs, nil)

ve = errs.(ValidationErrors)
Equal(t, len(ve), 1)

AssertError(t, errs, "Field2", "Field2", "Field2", "Field2", "required_unless")
}

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