golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/gen: Split strings in pascal/camcelCase on - in addition to _ (#631)

Browse Source
This commit is contained in:
Joe Harvey
2020-08-02 00:36:57 +12:00
committed by GitHub
parent c7bf64fa71
commit e9b406ca65
5 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
entc/integration/ent/migrate/schema.go
View File

@@ -323,7 +323,7 @@ var (
{Name: "nickname", Type: field.TypeString, Unique: true, Nullable: true},
{Name: "phone", Type: field.TypeString, Unique: true, Nullable: true},
{Name: "password", Type: field.TypeString, Nullable: true},
{Name: "role", Type: field.TypeEnum, Enums: []string{"admin", "user"}, Default: "user"},
{Name: "role", Type: field.TypeEnum, Enums: []string{"admin", "free-user", "user"}, Default: "user"},
{Name: "sso_cert", Type: field.TypeString, Nullable: true},
{Name: "group_blocked", Type: field.TypeInt, Nullable: true},
{Name: "user_spouse", Type: field.TypeInt, Unique: true, Nullable: true},

2
entc/integration/ent/schema/user.go
View File

@@ -41,7 +41,7 @@ func (User) Fields() []ent.Field {
Optional().
Sensitive(),
field.Enum("role").
Values("user", "admin").
Values("user", "admin", "free-user").
Default("user"),
field.String("SSOCert").
Optional(),

7
entc/integration/ent/user/user.go
View File

@@ -163,8 +163,9 @@ const DefaultRole = RoleUser
// Role values.
const (
RoleAdmin Role = "admin"
RoleUser Role = "user"
RoleAdmin Role = "admin"
RoleFreeUser Role = "free-user"
RoleUser Role = "user"
)
func (r Role) String() string {
@@ -174,7 +175,7 @@ func (r Role) String() string {
// RoleValidator is a validator for the "role" field enum values. It is called by the builders before save.
func RoleValidator(r Role) error {
switch r {
case RoleAdmin, RoleUser:
case RoleAdmin, RoleFreeUser, RoleUser:
return nil
default:
return fmt.Errorf("user: invalid enum value for role field: %q", r)

7
entc/integration/gremlin/ent/user/user.go
View File

@@ -96,8 +96,9 @@ const DefaultRole = RoleUser
// Role values.
const (
RoleAdmin Role = "admin"
RoleUser Role = "user"
RoleAdmin Role = "admin"
RoleFreeUser Role = "free-user"
RoleUser Role = "user"
)
func (r Role) String() string {
@@ -107,7 +108,7 @@ func (r Role) String() string {
// RoleValidator is a validator for the "role" field enum values. It is called by the builders before save.
func RoleValidator(r Role) error {
switch r {
case RoleAdmin, RoleUser:
case RoleAdmin, RoleFreeUser, RoleUser:
return nil
default:
return fmt.Errorf("user: invalid enum value for role field: %q", r)