Skip to content
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

Jump to bottom

entc/gen: block Optional on the ID field #2443

Merged
merged 3 commits into from Apr 2, 2022
Merged

entc/gen: block Optional on the ID field #2443

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaa278f
entc/gen: block Optional on the ID field
giautm Apr 2, 2022
0444141
chore: restore the old error message
giautm Apr 2, 2022
b47907e
Update entc/gen/type.go
giautm Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions entc/gen/type.go
View file
Open in desktop
Expand Up @@ -239,6 +239,9 @@ func NewType(c *Config, schema *load.Schema) (*Type, error) {
}
// User defined id field.
if tf.Name == typ.ID.Name {
if tf.Optional {
return nil, fmt.Errorf("id field must not be optional")
giautm marked this conversation as resolved.
Show resolved Hide resolved
}
typ.ID = tf
} else {
typ.Fields = append(typ.Fields, tf)
Expand Down
24 changes: 16 additions & 8 deletions entc/gen/type_test.go
View file
Open in desktop
Expand Up @@ -25,17 +25,17 @@ func TestType(t *testing.T) {

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Fields: []*load.Field{
{Unique: true, Default: true, Info: &field.TypeInfo{Type: field.TypeInt}},
{Name: "foo", Unique: true, Default: true, Info: &field.TypeInfo{Type: field.TypeInt}},
},
})
require.Error(err, "unique field can not have default")
require.EqualError(err, "unique field \"foo\" cannot have default value")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed the test to EqualError because the test was wrong, it just accept the field name cannot be empty error


_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Fields: []*load.Field{
{Sensitive: true, Tag: `yaml:"pwd"`, Info: &field.TypeInfo{Type: field.TypeString}},
{Name: "foo", Sensitive: true, Tag: `yaml:"pwd"`, Info: &field.TypeInfo{Type: field.TypeString}},
},
})
require.Error(err, "sensitive field cannot have tags")
require.EqualError(err, "sensitive field \"foo\" cannot have struct tags")

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Name: "T",
Expand All @@ -44,31 +44,39 @@ func TestType(t *testing.T) {
{Name: "foo", Unique: true, Info: &field.TypeInfo{Type: field.TypeInt}},
},
})
require.Error(err, "field foo redeclared")
require.EqualError(err, "field \"foo\" redeclared for type \"T\"")

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Name: "T",
Fields: []*load.Field{
{Name: "enums", Info: &field.TypeInfo{Type: field.TypeEnum}, Enums: []struct{ N, V string }{{V: "v"}, {V: "v"}}},
},
})
require.Error(err, "duplicate enums")
require.EqualError(err, "duplicate values \"v\" for enum field \"enums\"")

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Name: "T",
Fields: []*load.Field{
{Name: "enums", Info: &field.TypeInfo{Type: field.TypeEnum}, Enums: []struct{ N, V string }{{}}},
},
})
require.Error(err, "empty value for enums")
require.EqualError(err, "\"enums\" field value cannot be empty")

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Name: "T",
Fields: []*load.Field{
{Name: "", Info: &field.TypeInfo{Type: field.TypeInt}},
},
})
require.Error(err, "empty field name")
require.EqualError(err, "field name cannot be empty")

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{
Name: "T",
Fields: []*load.Field{
{Name: "id", Info: &field.TypeInfo{Type: field.TypeInt}, Optional: true},
},
})
require.EqualError(err, "id field must not be optional")
giautm marked this conversation as resolved.
Show resolved Hide resolved

_, err = NewType(&Config{Package: "entc/gen"}, &load.Schema{Name: "Type"})
require.EqualError(err, "schema lowercase name conflicts with Go keyword \"type\"")
Expand Down