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

fix: lint #43

Merged
merged 3 commits into from
Feb 12, 2024
Merged

fix: lint #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
247d7da
fix: lint
ginokent Feb 12, 2024
69b1467
ci: fix misc
ginokent Feb 12, 2024
1d9c474
fix: lint
ginokent Feb 12, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/go-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/go-mod-tidy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/cockroachdb/ddl_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/ddl/cockroachdb/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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() + "_pkey")
}
return &PrimaryKeyConstraint{
Name: constraintName,
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/mysql/ddl_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/mysql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions pkg/ddl/postgres/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/spanner/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddlctl/ddlctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/generator/dialect/mysql/create_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/generator/dialect/postgres/create_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/generator/dialect/spanner/create_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/show/mysql/show_create_all_tables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Loading