From 247d7dade9f68068add9f0d40a37ca9aeb0402ef Mon Sep 17 00:00:00 2001 From: ginokent <29125616+ginokent@users.noreply.github.com> Date: Tue, 13 Feb 2024 03:45:38 +0900 Subject: [PATCH 1/3] fix: lint --- .github/workflows/go-lint.yml | 2 +- pkg/ddl/cockroachdb/ddl_table.go | 2 +- pkg/ddl/cockroachdb/parser.go | 4 ++-- pkg/ddl/mysql/ddl_table.go | 2 +- pkg/ddlctl/ddlctl.go | 4 ++-- pkg/internal/generator/dialect/mysql/create_table.go | 2 +- pkg/internal/generator/dialect/postgres/create_table.go | 2 +- pkg/internal/generator/dialect/spanner/create_table.go | 2 +- pkg/show/mysql/show_create_all_tables.go | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml index eedfe8e..00f6a71 100644 --- a/.github/workflows/go-lint.yml +++ b/.github/workflows/go-lint.yml @@ -121,7 +121,7 @@ jobs: if [ -n "${GITHUB_TOKEN-}" ]; then direnv exec . bash -Eeux -o pipefail -c 'echo "${GOPRIVATE:-}${GOPRIVATE+,}" | while read -d , -r LINE; do echo "set git config: ${LINE}"; git config --global url."https://${GITHUB_TOKEN}:x-oauth-basic@${LINE}".insteadOf "https://${LINE}"; done' fi - - uses: golangci/golangci-lint-action@v3.7.0 # ref. https://github.com/golangci/golangci-lint-action#how-to-use + - uses: golangci/golangci-lint-action@v4.0.0 # ref. https://github.com/golangci/golangci-lint-action#how-to-use with: working-directory: ${{ env.WORKDIR }} args: --timeout=600s diff --git a/pkg/ddl/cockroachdb/ddl_table.go b/pkg/ddl/cockroachdb/ddl_table.go index 31bdcc1..0ff422b 100644 --- a/pkg/ddl/cockroachdb/ddl_table.go +++ b/pkg/ddl/cockroachdb/ddl_table.go @@ -28,7 +28,7 @@ func (constraints Constraints) Append(constraint Constraint) Constraints { } constraints = append(constraints, constraint) - sort.Slice(constraints, func(left, right int) bool { //diff:ignore-line-postgres-cockroach + sort.Slice(constraints, func(left, _ int) bool { //diff:ignore-line-postgres-cockroach _, leftIsPrimaryKeyConstraint := constraints[left].(*PrimaryKeyConstraint) //diff:ignore-line-postgres-cockroach switch { //diff:ignore-line-postgres-cockroach case leftIsPrimaryKeyConstraint: //diff:ignore-line-postgres-cockroach diff --git a/pkg/ddl/cockroachdb/parser.go b/pkg/ddl/cockroachdb/parser.go index 9fcfcd0..fb378e0 100644 --- a/pkg/ddl/cockroachdb/parser.go +++ b/pkg/ddl/cockroachdb/parser.go @@ -426,7 +426,7 @@ LabelConstraints: } p.nextToken() // current = KEY constraints = constraints.Append(&PrimaryKeyConstraint{ - Name: NewRawIdent(fmt.Sprintf("%s_pkey", tableName.StringForDiff())), + Name: NewRawIdent(tableName.StringForDiff() + "_pkey"), Columns: []*ColumnIdent{{Ident: column.Name}}, }) case TOKEN_REFERENCES: @@ -528,7 +528,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // return nil, apperr.Errorf("parseColumnIdents: %w", err) } if constraintName == nil { - constraintName = NewRawIdent(fmt.Sprintf("%s_pkey", tableName.StringForDiff())) + constraintName = NewRawIdent(tableName.StringForDiff() + "%s_pkey") } return &PrimaryKeyConstraint{ Name: constraintName, diff --git a/pkg/ddl/mysql/ddl_table.go b/pkg/ddl/mysql/ddl_table.go index c6dfa05..e4c09ee 100644 --- a/pkg/ddl/mysql/ddl_table.go +++ b/pkg/ddl/mysql/ddl_table.go @@ -28,7 +28,7 @@ func (constraints Constraints) Append(constraint Constraint) Constraints { } constraints = append(constraints, constraint) - sort.Slice(constraints, func(left, right int) bool { + sort.Slice(constraints, func(left, _ int) bool { _, leftIsPrimaryKeyConstraint := constraints[left].(*PrimaryKeyConstraint) switch { case leftIsPrimaryKeyConstraint: diff --git a/pkg/ddlctl/ddlctl.go b/pkg/ddlctl/ddlctl.go index 9868807..beb2160 100644 --- a/pkg/ddlctl/ddlctl.go +++ b/pkg/ddlctl/ddlctl.go @@ -63,7 +63,7 @@ func DDLCtl(ctx context.Context) error { Name: "version", Usage: "ddlctl version", Description: "show version", - RunFunc: func(ctx context.Context, args []string) error { + RunFunc: func(_ context.Context, _ []string) error { fmt.Printf("version: %s\n", version.Version()) //nolint:forbidigo fmt.Printf("revision: %s\n", version.Revision()) //nolint:forbidigo fmt.Printf("build branch: %s\n", version.Branch()) //nolint:forbidigo @@ -135,7 +135,7 @@ func DDLCtl(ctx context.Context) error { Default: cliz.Default(false), }, }, - RunFunc: func(ctx context.Context, args []string) error { + RunFunc: func(ctx context.Context, _ []string) error { cmd, err := cliz.FromContext(ctx) if err != nil { return apperr.Errorf("cliz.FromContext: %w", err) diff --git a/pkg/internal/generator/dialect/mysql/create_table.go b/pkg/internal/generator/dialect/mysql/create_table.go index 0516d0e..1aa70ad 100644 --- a/pkg/internal/generator/dialect/mysql/create_table.go +++ b/pkg/internal/generator/dialect/mysql/create_table.go @@ -77,7 +77,7 @@ func fprintCreateTable(buf *string, indent string, stmt *ddlast.CreateTableStmt) func fprintCreateTableColumn(buf *string, indent string, columns []*ddlast.CreateTableColumn, tailComma bool) { columnNameMaxLength := 0 - slicez.Each(columns, func(index int, elem *ddlast.CreateTableColumn) { + slicez.Each(columns, func(_ int, elem *ddlast.CreateTableColumn) { if columnLength := len(elem.ColumnName); columnLength > columnNameMaxLength { columnNameMaxLength = columnLength } diff --git a/pkg/internal/generator/dialect/postgres/create_table.go b/pkg/internal/generator/dialect/postgres/create_table.go index b98e769..dd6c279 100644 --- a/pkg/internal/generator/dialect/postgres/create_table.go +++ b/pkg/internal/generator/dialect/postgres/create_table.go @@ -77,7 +77,7 @@ func fprintCreateTable(buf *string, indent string, stmt *ddlast.CreateTableStmt) func fprintCreateTableColumn(buf *string, indent string, columns []*ddlast.CreateTableColumn, tailComma bool) { columnNameMaxLength := 0 - slicez.Each(columns, func(index int, elem *ddlast.CreateTableColumn) { + slicez.Each(columns, func(_ int, elem *ddlast.CreateTableColumn) { if columnLength := len(elem.ColumnName); columnLength > columnNameMaxLength { columnNameMaxLength = columnLength } diff --git a/pkg/internal/generator/dialect/spanner/create_table.go b/pkg/internal/generator/dialect/spanner/create_table.go index 75d67c8..1ffbaf4 100644 --- a/pkg/internal/generator/dialect/spanner/create_table.go +++ b/pkg/internal/generator/dialect/spanner/create_table.go @@ -75,7 +75,7 @@ func fprintCreateTable(buf *string, indent string, stmt *ddlast.CreateTableStmt) func fprintCreateTableColumn(buf *string, indent string, columns []*ddlast.CreateTableColumn, tailComma bool) { columnNameMaxLength := 0 - slicez.Each(columns, func(index int, elem *ddlast.CreateTableColumn) { + slicez.Each(columns, func(_ int, elem *ddlast.CreateTableColumn) { if columnLength := len(elem.ColumnName); columnLength > columnNameMaxLength { columnNameMaxLength = columnLength } diff --git a/pkg/show/mysql/show_create_all_tables.go b/pkg/show/mysql/show_create_all_tables.go index 09b8acd..a78e141 100644 --- a/pkg/show/mysql/show_create_all_tables.go +++ b/pkg/show/mysql/show_create_all_tables.go @@ -52,7 +52,7 @@ func ShowCreateAllTables(ctx context.Context, db sqlQueryerContext, opts ...Show } tableNames := new([]*TableName) - tableNamesQuery := fmt.Sprintf("SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = %s", databaseQuoted) + tableNamesQuery := "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = " + databaseQuoted if err := dbz.QueryContext(ctx, tableNames, tableNamesQuery); err != nil { return "", apperr.Errorf("dbz.QueryContext: q=%s: %w", tableNamesQuery, err) } From 69b1467a59afdbb00deb198e5a1b8a1103c6125d Mon Sep 17 00:00:00 2001 From: ginokent <29125616+ginokent@users.noreply.github.com> Date: Tue, 13 Feb 2024 03:46:55 +0900 Subject: [PATCH 2/3] ci: fix misc --- .github/workflows/go-mod-tidy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/go-mod-tidy.yml b/.github/workflows/go-mod-tidy.yml index 9432951..5f85409 100644 --- a/.github/workflows/go-mod-tidy.yml +++ b/.github/workflows/go-mod-tidy.yml @@ -34,6 +34,7 @@ defaults: jobs: go-mod-tidy: # NOTE: for Branch protection rule `Status checks that are required.` name: Run go mod tidy + if: github.actor != 'dependabot[bot]' permissions: id-token: write contents: write From 1d9c474eef6bc8ba723b58ee036fc060c26e5813 Mon Sep 17 00:00:00 2001 From: ginokent <29125616+ginokent@users.noreply.github.com> Date: Tue, 13 Feb 2024 03:53:05 +0900 Subject: [PATCH 3/3] fix: lint --- pkg/ddl/cockroachdb/parser.go | 4 ++-- pkg/ddl/mysql/parser.go | 2 +- pkg/ddl/postgres/parser.go | 12 ++++++------ pkg/ddl/spanner/parser.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/ddl/cockroachdb/parser.go b/pkg/ddl/cockroachdb/parser.go index fb378e0..bc46870 100644 --- a/pkg/ddl/cockroachdb/parser.go +++ b/pkg/ddl/cockroachdb/parser.go @@ -528,7 +528,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // return nil, apperr.Errorf("parseColumnIdents: %w", err) } if constraintName == nil { - constraintName = NewRawIdent(tableName.StringForDiff() + "%s_pkey") + constraintName = NewRawIdent(tableName.StringForDiff() + "_pkey") } return &PrimaryKeyConstraint{ Name: constraintName, @@ -583,7 +583,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // if constraintName == nil { name := tableName.StringForDiff() for _, ident := range idents { - name += fmt.Sprintf("_%s", ident.StringForDiff()) + name += "_" + ident.StringForDiff() } name += "_fkey" constraintName = NewRawIdent(name) diff --git a/pkg/ddl/mysql/parser.go b/pkg/ddl/mysql/parser.go index 4604459..5a88c7b 100644 --- a/pkg/ddl/mysql/parser.go +++ b/pkg/ddl/mysql/parser.go @@ -673,7 +673,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // if constraintName == nil { name := tableName.StringForDiff() for _, ident := range idents { - name += fmt.Sprintf("_%s", ident.StringForDiff()) + name += "_" + ident.StringForDiff() } name += "_fkey" constraintName = NewRawIdent(name) diff --git a/pkg/ddl/postgres/parser.go b/pkg/ddl/postgres/parser.go index 44c253d..0efd3d5 100644 --- a/pkg/ddl/postgres/parser.go +++ b/pkg/ddl/postgres/parser.go @@ -426,7 +426,7 @@ LabelConstraints: } p.nextToken() // current = KEY constraints = constraints.Append(&PrimaryKeyConstraint{ - Name: NewRawIdent(fmt.Sprintf("%s_pkey", tableName.StringForDiff())), + Name: NewRawIdent(tableName.StringForDiff() + "_pkey"), Columns: []*ColumnIdent{{Ident: column.Name}}, }) case TOKEN_REFERENCES: @@ -527,7 +527,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // return nil, apperr.Errorf("parseColumnIdents: %w", err) } if constraintName == nil { - constraintName = NewRawIdent(fmt.Sprintf("%s_pkey", tableName.StringForDiff())) + constraintName = NewRawIdent(tableName.StringForDiff() + "_pkey") } return &PrimaryKeyConstraint{ Name: constraintName, @@ -582,7 +582,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // if constraintName == nil { name := tableName.StringForDiff() for _, ident := range idents { - name += fmt.Sprintf("_%s", ident.StringForDiff()) + name += "_" + ident.StringForDiff() } name += "_fkey" constraintName = NewRawIdent(name) @@ -606,9 +606,9 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // return nil, apperr.Errorf("parseColumnIdents: %w", err) } if constraintName == nil { //diff:ignore-line-postgres-cockroach - name := fmt.Sprintf("%s_unique", tableName.StringForDiff()) //diff:ignore-line-postgres-cockroach - for _, ident := range idents { //diff:ignore-line-postgres-cockroach - name += fmt.Sprintf("_%s", ident.StringForDiff()) //diff:ignore-line-postgres-cockroach + name := tableName.StringForDiff() + "_unique" //diff:ignore-line-postgres-cockroach + for _, ident := range idents { //diff:ignore-line-postgres-cockroach + name += "_" + ident.StringForDiff() //diff:ignore-line-postgres-cockroach } //diff:ignore-line-postgres-cockroach constraintName = NewRawIdent(name) //diff:ignore-line-postgres-cockroach } //diff:ignore-line-postgres-cockroach diff --git a/pkg/ddl/spanner/parser.go b/pkg/ddl/spanner/parser.go index 9dd1388..f63a942 100644 --- a/pkg/ddl/spanner/parser.go +++ b/pkg/ddl/spanner/parser.go @@ -579,7 +579,7 @@ func (p *Parser) parseTableConstraint(tableName *Ident) (Constraint, error) { // if constraintName == nil { name := tableName.StringForDiff() for _, ident := range idents { - name += fmt.Sprintf("_%s", ident.StringForDiff()) + name += "_" + ident.StringForDiff() } name += "_fkey" constraintName = NewRawIdent(name)