revert some changes

Author: lunny

models/issues/label.go

@@ -495,23 +495,19 @@ func CountLabelsByOrgID(ctx context.Context, orgID int64) (int64, error) {
 }
 
 func updateLabelCols(ctx context.Context, l *Label, cols ...string) error {
-	sess := db.GetEngine(ctx).ID(l.ID)
-	if slices.Contains(cols, "num_issues") {
-		sess.SetExpr("num_issues",
+	_, err := db.GetEngine(ctx).ID(l.ID).
+		SetExpr("num_issues",
 			builder.Select("count(*)").From("issue_label").
 				Where(builder.Eq{"label_id": l.ID}),
-		)
-	}
-	if slices.Contains(cols, "num_closed_issues") {
-		sess.SetExpr("num_closed_issues",
+		).
+		SetExpr("num_closed_issues",
 			builder.Select("count(*)").From("issue_label").
 				InnerJoin("issue", "issue_label.issue_id = issue.id").
 				Where(builder.Eq{
 					"issue_label.label_id": l.ID,
 					"issue.is_closed":      true,
 				}),
-		)
-	}
-	_, err := sess.Cols(cols...).Update(l)
+		).
+		Cols(cols...).Update(l)
 	return err
 }

models/user/must_change_password.go

@@ -45,5 +45,5 @@ func SetMustChangePassword(ctx context.Context, all, mustChangePassword bool, in
 		cond = cond.And(builder.NotIn("lower_name", exclude))
 	}
 
-	return db.GetEngine(ctx).Where(cond).Cols("must_change_password").Update(&User{MustChangePassword: mustChangePassword})
+	return db.GetEngine(ctx).Where(cond).MustCols("must_change_password").Update(&User{MustChangePassword: mustChangePassword})
 }