From 8cb2428ea3a355916d570a330815de18609d11f9 Mon Sep 17 00:00:00 2001 From: Ariel Mashraki Date: Tue, 30 Jul 2019 05:28:09 -0700 Subject: [PATCH] ent: fix lint errors Reviewed By: idoshveki Differential Revision: D16560151 fbshipit-source-id: 703f6e28403b14fc667fa7c592f0f3827a9335a6 --- dialect/sql/builder.go | 63 ++++++++++++++++++++---------------------- entc/gen/graph_test.go | 10 +++---- entc/gen/template.go | 1 - field/field.go | 7 ----- 4 files changed, 35 insertions(+), 46 deletions(-) diff --git a/dialect/sql/builder.go b/dialect/sql/builder.go index 8e4c33144..5761acada 100644 --- a/dialect/sql/builder.go +++ b/dialect/sql/builder.go @@ -20,7 +20,7 @@ type Queries []Querier // Query returns query representation of Queriers. func (n Queries) Query() (string, []interface{}) { - b := Builder{} + var b Builder for i := range n { if i > 0 { b.Pad() @@ -196,7 +196,7 @@ type TableBuilder struct { // ). // PrimaryKey("id") // -func CreateTable(name string) *TableBuilder { return &TableBuilder{b: Builder{}, name: name} } +func CreateTable(name string) *TableBuilder { return &TableBuilder{name: name} } // IfNotExists appends the `IF NOT EXISTS` clause to the `CREATE TABLE` statement. func (t *TableBuilder) IfNotExists() *TableBuilder { @@ -224,23 +224,23 @@ func (t *TableBuilder) PrimaryKey(column ...string) *TableBuilder { // ForeignKeys adds a list of foreign-keys to the statement (without constraints). func (t *TableBuilder) ForeignKeys(fks ...*ForeignKeyBuilder) *TableBuilder { - Queriers := make([]Querier, len(fks)) + queries := make([]Querier, len(fks)) for i := range fks { // erase the constraint symbol/name. fks[i].symbol = "" - Queriers[i] = fks[i] + queries[i] = fks[i] } - t.constraints = append(t.constraints, Queriers...) + t.constraints = append(t.constraints, queries...) return t } // Constraints adds a list of foreign-key constraints to the statement. func (t *TableBuilder) Constraints(fks ...*ForeignKeyBuilder) *TableBuilder { - Queriers := make([]Querier, len(fks)) + queries := make([]Querier, len(fks)) for i := range fks { - Queriers[i] = &Wrapper{"CONSTRAINT %s", fks[i]} + queries[i] = &Wrapper{"CONSTRAINT %s", fks[i]} } - t.constraints = append(t.constraints, Queriers...) + t.constraints = append(t.constraints, queries...) return t } @@ -299,7 +299,7 @@ type DescribeBuilder struct { // // Describe("users") // -func Describe(name string) *DescribeBuilder { return &DescribeBuilder{b: Builder{}, name: name} } +func Describe(name string) *DescribeBuilder { return &DescribeBuilder{name: name} } // Query returns query representation of a `DESCRIBE` statement. func (t *DescribeBuilder) Query() (string, []interface{}) { @@ -321,7 +321,7 @@ type TableAlter struct { // AddColumn(Column("group_id").Type("int").Attr("UNIQUE")). // AddForeignKey(ForeignKey().Columns("group_id"). Reference(Reference().Table("groups").Columns("id")).OnDelete("CASCADE")) // -func AlterTable(name string) *TableAlter { return &TableAlter{b: Builder{}, name: name} } +func AlterTable(name string) *TableAlter { return &TableAlter{name: name} } // AddColumn appends the `ADD COLUMN` clause to the given `ALTER TABLE` statement. func (t *TableAlter) AddColumn(c *ColumnBuilder) *TableAlter { @@ -426,7 +426,6 @@ type ReferenceBuilder struct { b Builder table string // referenced table. columns []string // referenced columns. - actions []string // reference actions. } // Reference create a reference builder for the reference_option clause. @@ -968,7 +967,7 @@ func Avg(column string) string { // As suffixed the given column with an alias (`a` AS `b`). func As(column string, as string) string { - b := Builder{} + var b Builder b.Append(column).Pad().WriteString("AS") b.Pad().Append(as) return b.String() @@ -976,7 +975,7 @@ func As(column string, as string) string { // Distinct prefixed the given columns with the `DISTINCT` keyword (DISTINCT `id`). func Distinct(columns ...string) string { - b := Builder{} + var b Builder b.WriteString("DISTINCT") b.Pad().AppendComma(columns...) return b.String() @@ -1208,7 +1207,7 @@ func (s *Selector) As(alias string) *Selector { func (s *Selector) Count(columns ...string) *Selector { column := "*" if len(columns) > 0 { - b := Builder{} + var b Builder b.AppendComma(columns...) column = b.String() } @@ -1241,14 +1240,14 @@ func (s *Selector) Clone() *Selector { // Asc adds the ASC suffix for the given column. func Asc(column string) string { - b := Builder{} + var b Builder b.Append(column).WriteString(" ASC") return b.String() } // Desc adds the DESC suffix for the given column. func Desc(column string) string { - b := Builder{} + var b Builder b.Append(column).WriteString(" DESC") return b.String() } @@ -1273,7 +1272,7 @@ func (s *Selector) Having(p *Predicate) *Selector { // Query returns query representation of a `SELECT` statement. func (s *Selector) Query() (string, []interface{}) { - b := &Builder{} + var b Builder b.WriteString("SELECT ") if s.distinct { b.WriteString("DISTINCT ") @@ -1285,21 +1284,19 @@ func (s *Selector) Query() (string, []interface{}) { } b.WriteString(" FROM ") b.WriteString(s.from.ref()) - if len(s.joins) > 0 { - for _, join := range s.joins { - b.WriteString(fmt.Sprintf(" %s ", join.kind)) - switch view := join.table.(type) { - case *SelectTable: - b.WriteString(view.ref()) - case *Selector: - query, args := view.Query() - b.WriteString(fmt.Sprintf("(%s) AS `%s`", query, view.as)) - b.args = append(b.args, args...) - } - if join.on != "" { - b.WriteString(" ON ") - b.WriteString(join.on) - } + for _, join := range s.joins { + b.WriteString(fmt.Sprintf(" %s ", join.kind)) + switch view := join.table.(type) { + case *SelectTable: + b.WriteString(view.ref()) + case *Selector: + query, args := view.Query() + b.WriteString(fmt.Sprintf("(%s) AS `%s`", query, view.as)) + b.args = append(b.args, args...) + } + if join.on != "" { + b.WriteString(" ON ") + b.WriteString(join.on) } } if s.where != nil { @@ -1408,7 +1405,7 @@ func isModifier(s string) bool { } func agg(fn, column string) string { - b := Builder{} + var b Builder b.WriteString(fn) b.Nested(func(b *Builder) { b.Append(column) diff --git a/entc/gen/graph_test.go b/entc/gen/graph_test.go index 367a74dca..e62d77725 100644 --- a/entc/gen/graph_test.go +++ b/entc/gen/graph_test.go @@ -70,10 +70,10 @@ func (T2) Edges() []ent.Edge { func TestNewGraph(t *testing.T) { require := require.New(t) - graph, err := NewGraph(Config{Package: "entc/gen"}, T1{}) + _, err := NewGraph(Config{Package: "entc/gen", Storage: drivers}, T1{}) require.Error(err, "should fail due to missing types") - graph, err = NewGraph(Config{Package: "entc/gen"}, T1{}, T2{}) + graph, err := NewGraph(Config{Package: "entc/gen", Storage: drivers}, T1{}, T2{}) require.NoError(err) require.NotNil(graph) require.Len(graph.Nodes, 2) @@ -130,10 +130,10 @@ func TestNewGraph(t *testing.T) { func TestRelation(t *testing.T) { require := require.New(t) - graph, err := NewGraph(Config{Package: "entc/gen"}, T1{}) + _, err := NewGraph(Config{Package: "entc/gen", Storage: drivers}, T1{}) require.Error(err, "should fail due to missing types") - graph, err = NewGraph(Config{Package: "entc/gen"}, T1{}, T2{}) + graph, err := NewGraph(Config{Package: "entc/gen"}, T1{}, T2{}) require.NoError(err) require.NotNil(graph) require.Len(graph.Nodes, 2) @@ -166,7 +166,7 @@ func TestGraph_Gen(t *testing.T) { target := filepath.Join(os.TempDir(), "ent") require.NoError(os.MkdirAll(target, os.ModePerm), "creating tmpdir") defer os.Remove(target) - graph, err := NewGraph(Config{Package: "entc/gen", Target: target}, T1{}, T2{}) + graph, err := NewGraph(Config{Package: "entc/gen", Target: target, Storage: drivers}, T1{}, T2{}) require.NoError(err) require.NotNil(graph) require.NoError(graph.Gen()) diff --git a/entc/gen/template.go b/entc/gen/template.go index a9084239a..e7e2ab596 100644 --- a/entc/gen/template.go +++ b/entc/gen/template.go @@ -99,7 +99,6 @@ func init() { for _, asset := range AssetNames() { templates = template.Must(templates.Parse(string(MustAsset(asset)))) } - return } func pkgf(s string) func(t *Type) string { diff --git a/field/field.go b/field/field.go index 518a9eace..179ef5f07 100644 --- a/field/field.go +++ b/field/field.go @@ -78,13 +78,11 @@ type Field struct { tag string size int name string - comment string charset string unique bool nullable bool optional bool value interface{} - matchers []*regexp.Regexp validators []interface{} } @@ -211,7 +209,6 @@ func (b *intBuilder) Nullable() *intBuilder { // Comment sets the comment of the field. func (b *intBuilder) Comment(c string) *intBuilder { - b.comment = c return b } @@ -297,7 +294,6 @@ func (b *floatBuilder) Nullable() *floatBuilder { // Comment sets the comment of the field. func (b *floatBuilder) Comment(c string) *floatBuilder { - b.comment = c return b } @@ -395,7 +391,6 @@ func (b *stringBuilder) Optional() *stringBuilder { // Comment sets the comment of the field. func (b *stringBuilder) Comment(c string) *stringBuilder { - b.comment = c return b } @@ -440,7 +435,6 @@ func (b *timeBuilder) Optional() *timeBuilder { // Comment sets the comment of the field. func (b *timeBuilder) Comment(c string) *timeBuilder { - b.comment = c return b } @@ -477,7 +471,6 @@ func (b *boolBuilder) Optional() *boolBuilder { // Comment sets the comment of the field. func (b *boolBuilder) Comment(c string) *boolBuilder { - b.comment = c return b }