Skip to content

Commit d5f7166

Browse files
authored
Fix issues reported by golangci-lint (#121)
1 parent 7a6770e commit d5f7166

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

generate_perror/main.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func scanErrCodeFile(fileName string, nameToNum map[string]int) {
7878
r := regexp.MustCompile(`^\s+(\w+)*\s+=\s+(\d+)$`)
7979
for s.Scan() {
8080
m := r.FindStringSubmatch(s.Text())
81-
if m != nil && len(m) == 3 && m[1] != "" && m[2] != "" {
81+
if len(m) == 3 && m[1] != "" && m[2] != "" {
8282
i, err := strconv.Atoi(m[2])
8383
if err != nil {
8484
log.Fatal(err)
@@ -134,7 +134,7 @@ func main() {
134134
r := regexp.MustCompile(`^MySQL error code MY-0*(\d+) \((\w+)\)`)
135135
for s.Scan() {
136136
m := r.FindStringSubmatch(s.Text())
137-
if m != nil && len(m) == 3 && m[1] != "" && m[2] != "" {
137+
if len(m) == 3 && m[1] != "" && m[2] != "" {
138138
c, err := strconv.Atoi(m[1])
139139
if err != nil {
140140
log.Fatal(err)
@@ -145,7 +145,10 @@ func main() {
145145
checkNewErr(m[2], i, NameToNum)
146146
}
147147
}
148-
cmd.Wait()
148+
err = cmd.Wait()
149+
if err != nil {
150+
log.Fatal(err)
151+
}
149152
}
150153
if maxError >= 1000 {
151154
fmt.Printf("\r")
@@ -170,7 +173,7 @@ func main() {
170173
sort.Slice(codes, func(i, j int) bool {
171174
return codes[i].Code < codes[j].Code || codes[i].Code == codes[j].Code && codes[i].Name < codes[j].Name
172175
})
173-
for i, _ := range codes {
176+
for i := range codes {
174177
_, err = w.WriteString("\t\"" + codes[i].Name + `": ` + strconv.Itoa(codes[i].Code) + ",\n")
175178
if err != nil {
176179
log.Fatal(err)

src/main.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,10 @@ func (t *tester) preProcess() {
291291

292292
func (t *tester) postProcess() {
293293
if !reserveSchema {
294-
t.mdb.Exec(fmt.Sprintf("drop database `%s`", strings.ReplaceAll(t.name, "/", "__")))
294+
_, err := t.mdb.Exec(fmt.Sprintf("drop database `%s`", strings.ReplaceAll(t.name, "/", "__")))
295+
if err != nil {
296+
log.Errorf("failed to drop database: %s", err.Error())
297+
}
295298
}
296299
for _, v := range t.conn {
297300
v.conn.Close()
@@ -918,13 +921,16 @@ func (t *tester) executeStmt(query string) error {
918921
}
919922

920923
if t.enableInfo {
921-
t.curr.conn.Raw(func(driverConn any) error {
924+
err = t.curr.conn.Raw(func(driverConn any) error {
922925
rowsAffected := driverConn.(*mysql.MysqlConn).RowsAffected()
923926
lastMessage := driverConn.(*mysql.MysqlConn).LastMessage()
924927
t.buf.WriteString(fmt.Sprintf("affected rows: %d\n", rowsAffected))
925928
t.buf.WriteString(fmt.Sprintf("info: %s\n", lastMessage))
926929
return nil
927930
})
931+
if err != nil {
932+
log.Errorf("failed to get info: %s", err.Error())
933+
}
928934
}
929935

930936
if t.enableWarning {

0 commit comments

Comments
 (0)