Skip to content

Commit fd19e1a

Browse files
committed
fix golangci-lint
1 parent 3ad1bf3 commit fd19e1a

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

go/gopg/server.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,15 @@ func (s *Server) addProductToOrder(w http.ResponseWriter, r *http.Request, ps ht
316316
ID: orderID,
317317
}
318318
if err := s.db.Model(&order).Select(); err != nil {
319-
tx.Rollback()
319+
_ = tx.Rollback()
320320
http.Error(w, err.Error(), errToStatusCode(err))
321321
return
322322
}
323323

324324
const productIDParam = "productID"
325325
productIDString := r.URL.Query().Get(productIDParam)
326326
if productIDString == "" {
327-
tx.Rollback()
327+
_ = tx.Rollback()
328328
writeMissingParamError(w, productIDParam)
329329
return
330330
}
@@ -337,14 +337,14 @@ func (s *Server) addProductToOrder(w http.ResponseWriter, r *http.Request, ps ht
337337
ID: productID,
338338
}
339339
if err := s.db.Model(&addedProduct).Select(); err != nil {
340-
tx.Rollback()
340+
_ = tx.Rollback()
341341
http.Error(w, err.Error(), errToStatusCode(err))
342342
return
343343
}
344344

345345
order.Products = append(order.Products, addedProduct)
346346
if _, err := tx.Model(&order).Insert(); err != nil {
347-
tx.Rollback()
347+
_ = tx.Rollback()
348348
http.Error(w, err.Error(), errToStatusCode(err))
349349
return
350350
}
@@ -353,7 +353,7 @@ func (s *Server) addProductToOrder(w http.ResponseWriter, r *http.Request, ps ht
353353
Product: addedProduct,
354354
}
355355
if _, err := tx.Model(&orderProduct).Insert(); err != nil {
356-
tx.Rollback()
356+
_ = tx.Rollback()
357357
http.Error(w, err.Error(), errToStatusCode(err))
358358
return
359359
}

go/gorm/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ func setupDB(addr string) *gorm.DB {
3636
}
3737

3838
// Migrate the schema
39-
db.AutoMigrate(&model.Customer{}, &model.Order{}, &model.Product{})
39+
if err := db.AutoMigrate(&model.Customer{}, &model.Order{}, &model.Product{}); err != nil {
40+
panic(err)
41+
}
4042

4143
return db
4244
}

go/gorm/server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,29 +248,29 @@ func (s *Server) addProductToOrder(w http.ResponseWriter, r *http.Request, ps ht
248248
var order model.Order
249249
orderID := ps.ByName("orderID")
250250
if err := tx.Preload("Products").First(&order, orderID).Error; err != nil {
251-
tx.Rollback()
251+
_ = tx.Rollback()
252252
http.Error(w, err.Error(), errToStatusCode(err))
253253
return
254254
}
255255

256256
const productIDParam = "productID"
257257
productID := r.URL.Query().Get(productIDParam)
258258
if productID == "" {
259-
tx.Rollback()
259+
_ = tx.Rollback()
260260
writeMissingParamError(w, productIDParam)
261261
return
262262
}
263263

264264
var addedProduct model.Product
265265
if err := tx.First(&addedProduct, productID).Error; err != nil {
266-
tx.Rollback()
266+
_ = tx.Rollback()
267267
http.Error(w, err.Error(), errToStatusCode(err))
268268
return
269269
}
270270

271271
order.Products = append(order.Products, addedProduct)
272272
if err := tx.Save(&order).Error; err != nil {
273-
tx.Rollback()
273+
_ = tx.Rollback()
274274
http.Error(w, err.Error(), errToStatusCode(err))
275275
return
276276
}

testing/test_driver.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,9 @@ func (td testDriver) queryIDs(t *testing.T, table string) ([]int, error) {
291291
var ids []int
292292
for rows.Next() {
293293
var id int
294-
rows.Scan(&id)
294+
if err := rows.Scan(&id); err != nil {
295+
t.Fatal(err)
296+
}
295297
ids = append(ids, id)
296298
}
297299
if err := rows.Err(); err != nil {
@@ -336,7 +338,9 @@ func rowsToStringSlice(rows *sql.Rows) ([]string, error) {
336338

337339
var s []string
338340
for rows.Next() {
339-
rows.Scan(vals...)
341+
if err := rows.Scan(vals...); err != nil {
342+
return nil, err
343+
}
340344
s = append(s, strings.Join(strs, ", "))
341345
}
342346
if err := rows.Err(); err != nil {

0 commit comments

Comments
 (0)