Skip to content

Commit a523aff

Browse files
rjarryrjarry
committed
db: use query wrappers in internal methods
Route the internal db methods through the new Select, Update and Delete helpers for consistency with the rest of the package. Signed-off-by: Robin Jarry <robin@jarry.cc>
1 parent 54d46ec commit a523aff

14 files changed

Lines changed: 70 additions & 75 deletions

File tree

‎pkg/db/bundle.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ func (q *Queries) LoadBundlePatches(bundles []Bundle) error {
2424
Patch
2525
}
2626
var rows []row
27-
if err := q.DB.NewSelect().
28-
Model((*BundlePatch)(nil)).
27+
if err := q.Select((*BundlePatch)(nil)).
2928
ColumnExpr(`bundle_patch.bundle_id, bundle_patch.?, patch.*`, bun.Ident("order")).
3029
Join("JOIN patch ON patch.id = bundle_patch.patch_id").
3130
Where("bundle_patch.bundle_id IN ?", bun.Tuple(ids)).
@@ -49,7 +48,7 @@ func (q *Queries) LoadBundlePatches(bundles []Bundle) error {
4948

5049
func (q *Queries) ListUserBundles(userID int) ([]Bundle, error) {
5150
var bundles []Bundle
52-
err := q.DB.NewSelect().Model(&bundles).
51+
err := q.Select(&bundles).
5352
Where("owner_id = ?", userID).
5453
OrderExpr("name ASC").
5554
Scan(q.Ctx)

‎pkg/db/check.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (q *Queries) LoadPatchCheckCounts(patches []Patch) error {
4141
Count int `bun:"count"`
4242
}
4343
var rows []checkRow
44-
if err := q.DB.NewSelect().Model((*Check)(nil)).
44+
if err := q.Select((*Check)(nil)).
4545
Column("patch_id", "state").
4646
ColumnExpr("count(*) AS count").
4747
Where("patch_id IN ?", bun.Tuple(ids)).

‎pkg/db/comment.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ package db
77

88
func (q *Queries) GetPatchCommentByID(id int) (*PatchComment, error) {
99
var c PatchComment
10-
err := q.DB.NewSelect().Model(&c).
10+
err := q.Select(&c).
1111
Where("id = ?", id).
1212
Scan(q.Ctx)
1313
return &c, err
1414
}
1515

1616
func (q *Queries) GetCoverCommentByID(id int) (*CoverComment, error) {
1717
var c CoverComment
18-
err := q.DB.NewSelect().Model(&c).
18+
err := q.Select(&c).
1919
Where("id = ?", id).
2020
Scan(q.Ctx)
2121
return &c, err
2222
}
2323

2424
func (q *Queries) ListPatchComments(patchID int) ([]PatchComment, error) {
2525
var comments []PatchComment
26-
err := q.DB.NewSelect().Model(&comments).
26+
err := q.Select(&comments).
2727
Relation("Submitter").
2828
Where("patch_id = ?", patchID).
2929
OrderExpr("date ASC").
@@ -33,7 +33,7 @@ func (q *Queries) ListPatchComments(patchID int) ([]PatchComment, error) {
3333

3434
func (q *Queries) ListCoverComments(coverID int) ([]CoverComment, error) {
3535
var comments []CoverComment
36-
err := q.DB.NewSelect().Model(&comments).
36+
err := q.Select(&comments).
3737
Relation("Submitter").
3838
Where("cover_id = ?", coverID).
3939
OrderExpr("date ASC").

‎pkg/db/confirmation.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (q *Queries) CreateEmailConfirmation(confType, email string, userID *int) (
3232
Date: time.Now(),
3333
Active: true,
3434
}
35-
err := q.DB.NewInsert().Model(conf).Scan(q.Ctx)
35+
err := q.Insert(conf)
3636
if err != nil {
3737
return nil, err
3838
}
@@ -41,7 +41,7 @@ func (q *Queries) CreateEmailConfirmation(confType, email string, userID *int) (
4141

4242
func (q *Queries) CleanExpiredConfirmations() (int64, error) {
4343
cutoff := time.Now().Add(-confirmationValidityDays * 24 * time.Hour)
44-
res, err := q.DB.NewDelete().Model((*EmailConfirmation)(nil)).
44+
res, err := q.Delete((*EmailConfirmation)(nil)).
4545
Where("date < ? OR active = ?", cutoff, false).
4646
Exec(q.Ctx)
4747
if err != nil {
@@ -52,11 +52,11 @@ func (q *Queries) CleanExpiredConfirmations() (int64, error) {
5252
}
5353

5454
func (q *Queries) CleanInactiveUsers() (int64, error) {
55-
res, err := q.DB.NewDelete().Model((*User)(nil)).
55+
res, err := q.Delete((*User)(nil)).
5656
Where("is_active = ?", false).
5757
Where(
5858
"id NOT IN ?",
59-
q.DB.NewSelect().Model((*EmailConfirmation)(nil)).
59+
q.Select((*EmailConfirmation)(nil)).
6060
Column("user_id").
6161
Where("user_id IS NOT NULL"),
6262
).

‎pkg/db/cover.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package db
77

88
func (q *Queries) GetCoverByID(id int) (*Cover, error) {
99
var c Cover
10-
err := q.DB.NewSelect().Model(&c).
10+
err := q.Select(&c).
1111
Where("id = ?", id).
1212
Scan(q.Ctx)
1313
return &c, err
@@ -22,7 +22,7 @@ func (q *Queries) CreateCover(cover *Cover) error {
2222

2323
func (q *Queries) GetCoverByProjectAndMsgID(projectID int, msgid string) (*Cover, error) {
2424
var c Cover
25-
err := q.DB.NewSelect().Model(&c).
25+
err := q.Select(&c).
2626
Where("project_id = ?", projectID).
2727
Where("msgid = ?", msgid).
2828
Scan(q.Ctx)
@@ -31,7 +31,7 @@ func (q *Queries) GetCoverByProjectAndMsgID(projectID int, msgid string) (*Cover
3131

3232
func (q *Queries) FindCoverByCommentMsgID(msgid string) (*Cover, error) {
3333
var c Cover
34-
err := q.DB.NewSelect().Model(&c).
34+
err := q.Select(&c).
3535
Join("JOIN cover_comment AS cc ON cc.cover_id = cover.id").
3636
Where("cc.msgid = ?", msgid).
3737
Limit(1).

‎pkg/db/event.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package db
88
import "time"
99

1010
func (q *Queries) CleanOldEvents(cutoff time.Time) (int64, error) {
11-
res, err := q.DB.NewDelete().Model((*Event)(nil)).
11+
res, err := q.Delete((*Event)(nil)).
1212
Where("date < ?", cutoff).Exec(q.Ctx)
1313
if err != nil {
1414
return 0, err

‎pkg/db/patch.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "github.com/uptrace/bun"
99

1010
func (q *Queries) GetPatchByID(id int) (*Patch, error) {
1111
var p Patch
12-
err := q.DB.NewSelect().Model(&p).
12+
err := q.Select(&p).
1313
Where("id = ?", id).
1414
Scan(q.Ctx)
1515
return &p, err
@@ -24,7 +24,7 @@ func (q *Queries) CreatePatch(patch *Patch) error {
2424

2525
func (q *Queries) GetPatchByProjectAndMsgID(projectID int, msgid string) (*Patch, error) {
2626
var p Patch
27-
err := q.DB.NewSelect().Model(&p).
27+
err := q.Select(&p).
2828
Where("project_id = ?", projectID).
2929
Where("msgid = ?", msgid).
3030
Scan(q.Ctx)
@@ -33,23 +33,23 @@ func (q *Queries) GetPatchByProjectAndMsgID(projectID int, msgid string) (*Patch
3333

3434
func (q *Queries) GetPatchByMsgID(msgid string) ([]Patch, error) {
3535
var patches []Patch
36-
err := q.DB.NewSelect().Model(&patches).
36+
err := q.Select(&patches).
3737
Where("msgid = ?", msgid).
3838
Scan(q.Ctx)
3939
return patches, err
4040
}
4141

4242
func (q *Queries) FindPatchByCommentMsgID(msgid string) ([]Patch, error) {
4343
var patches []Patch
44-
err := q.DB.NewSelect().Model(&patches).
44+
err := q.Select(&patches).
4545
Join("JOIN patch_comment AS pc ON pc.patch_id = patch.id").
4646
Where("pc.msgid = ?", msgid).
4747
Scan(q.Ctx)
4848
return patches, err
4949
}
5050

5151
func (q *Queries) UpdatePatchSeries(id int, seriesID *int, number *int) error {
52-
_, err := q.DB.NewUpdate().Model((*Patch)(nil)).
52+
_, err := q.Update((*Patch)(nil)).
5353
Set("series_id = ?", seriesID).
5454
Set("number = ?", number).
5555
Where("id = ?", id).
@@ -59,23 +59,23 @@ func (q *Queries) UpdatePatchSeries(id int, seriesID *int, number *int) error {
5959

6060
func (q *Queries) GetPatchBySeriesAndNumber(seriesID int, number int) (*Patch, error) {
6161
var p Patch
62-
err := q.DB.NewSelect().Model(&p).
62+
err := q.Select(&p).
6363
Where("series_id = ?", seriesID).
6464
Where("number = ?", number).
6565
Scan(q.Ctx)
6666
return &p, err
6767
}
6868

6969
func (q *Queries) CountPredecessorPatches(seriesID int, number int) (int, error) {
70-
return q.DB.NewSelect().Model((*Patch)(nil)).
70+
return q.Select((*Patch)(nil)).
7171
Where("series_id = ?", seriesID).
7272
Where("number < ?", number).
7373
Count(q.Ctx)
7474
}
7575

7676
func (q *Queries) GetSuccessorPatches(seriesID int, number int) ([]Patch, error) {
7777
var patches []Patch
78-
err := q.DB.NewSelect().Model(&patches).
78+
err := q.Select(&patches).
7979
Where("series_id = ?", seriesID).
8080
Where("number > ?", number).
8181
OrderExpr("number ASC").
@@ -84,15 +84,15 @@ func (q *Queries) GetSuccessorPatches(seriesID int, number int) ([]Patch, error)
8484
}
8585

8686
func (q *Queries) UpdatePatchesBySeriesToState(seriesID, stateID *int) error {
87-
_, err := q.DB.NewUpdate().Model((*Patch)(nil)).
87+
_, err := q.Update((*Patch)(nil)).
8888
Set("state_id = ?", stateID).
8989
Where("series_id = ?", seriesID).
9090
Exec(q.Ctx)
9191
return err
9292
}
9393

9494
func (q *Queries) CountPatchesInSeries(seriesID int) (int, error) {
95-
return q.DB.NewSelect().Model((*Patch)(nil)).
95+
return q.Select((*Patch)(nil)).
9696
Where("series_id = ?", seriesID).
9797
Count(q.Ctx)
9898
}
@@ -107,7 +107,7 @@ func (q *Queries) LoadPatchRelated(patches []Patch) error {
107107
byRelID := make(map[int][]PatchRef)
108108
if len(relatedIDs) > 0 {
109109
var related []Patch
110-
if err := q.DB.NewSelect().Model(&related).
110+
if err := q.Select(&related).
111111
Column("id", "name", "related_id").
112112
Where("related_id IN ?", bun.Tuple(relatedIDs)).
113113
Scan(q.Ctx); err != nil {

‎pkg/db/project.go‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,39 @@ import "github.com/uptrace/bun"
99

1010
func (q *Queries) GetProjectByLinkname(linkname string) (*Project, error) {
1111
var p Project
12-
err := q.DB.NewSelect().Model(&p).
12+
err := q.Select(&p).
1313
Where("linkname = ?", linkname).
1414
Scan(q.Ctx)
1515
return &p, err
1616
}
1717

1818
func (q *Queries) GetProjectByID(id int) (*Project, error) {
1919
var p Project
20-
err := q.DB.NewSelect().Model(&p).
20+
err := q.Select(&p).
2121
Where("id = ?", id).
2222
Scan(q.Ctx)
2323
return &p, err
2424
}
2525

2626
func (q *Queries) ListProjects() ([]Project, error) {
2727
var projects []Project
28-
err := q.DB.NewSelect().Model(&projects).
28+
err := q.Select(&projects).
2929
OrderExpr("name ASC").
3030
Scan(q.Ctx)
3131
return projects, err
3232
}
3333

3434
func (q *Queries) ListStates() ([]State, error) {
3535
var states []State
36-
err := q.DB.NewSelect().Model(&states).
36+
err := q.Select(&states).
3737
OrderExpr("ordering ASC").
3838
Scan(q.Ctx)
3939
return states, err
4040
}
4141

4242
func (q *Queries) ListProjectMaintainers(projectID int) ([]User, error) {
4343
var users []User
44-
err := q.DB.NewSelect().Model(&users).
44+
err := q.Select(&users).
4545
Join("JOIN project_maintainer AS pm ON pm.user_id = auth_user.id").
4646
Where("pm.project_id = ?", projectID).
4747
OrderExpr("auth_user.username ASC").
@@ -65,8 +65,7 @@ func (q *Queries) LoadProjectMaintainers(projects []Project) error {
6565
User
6666
}
6767
var rows []row
68-
if err := q.DB.NewSelect().
69-
Model((*ProjectMaintainer)(nil)).
68+
if err := q.Select((*ProjectMaintainer)(nil)).
7069
ColumnExpr("project_maintainer.project_id, u.*").
7170
Join("JOIN auth_user AS u ON u.id = project_maintainer.user_id").
7271
Where("project_maintainer.project_id IN ?", bun.Tuple(ids)).
@@ -91,8 +90,7 @@ func (q *Queries) IsMaintainer(user *User, projectID int) bool {
9190
if user.IsAdmin {
9291
return true
9392
}
94-
count, _ := q.DB.NewSelect().
95-
Model((*ProjectMaintainer)(nil)).
93+
count, _ := q.Select((*ProjectMaintainer)(nil)).
9694
Where("user_id = ?", user.ID).
9795
Where("project_id = ?", projectID).
9896
Count(q.Ctx)
@@ -101,39 +99,39 @@ func (q *Queries) IsMaintainer(user *User, projectID int) bool {
10199

102100
func (q *Queries) GetProjectByListID(listid string) ([]Project, error) {
103101
var projects []Project
104-
err := q.DB.NewSelect().Model(&projects).
102+
err := q.Select(&projects).
105103
Where("listid = ?", listid).
106104
Scan(q.Ctx)
107105
return projects, err
108106
}
109107

110108
func (q *Queries) GetDefaultState() (*State, error) {
111109
var s State
112-
err := q.DB.NewSelect().Model(&s).
110+
err := q.Select(&s).
113111
Where("ordering = 0").
114112
Scan(q.Ctx)
115113
return &s, err
116114
}
117115

118116
func (q *Queries) GetStateByName(name string) (*State, error) {
119117
var s State
120-
err := q.DB.NewSelect().Model(&s).
118+
err := q.Select(&s).
121119
Where("lower(name) = lower(?)", name).
122120
Scan(q.Ctx)
123121
return &s, err
124122
}
125123

126124
func (q *Queries) GetStateBySlug(slug string) (*State, error) {
127125
var s State
128-
err := q.DB.NewSelect().Model(&s).
126+
err := q.Select(&s).
129127
Where("slug = ?", slug).
130128
Scan(q.Ctx)
131129
return &s, err
132130
}
133131

134132
func (q *Queries) ListDelegationRulesByProject(projectID int) ([]DelegationRule, error) {
135133
var rules []DelegationRule
136-
err := q.DB.NewSelect().Model(&rules).
134+
err := q.Select(&rules).
137135
Where("project_id = ?", projectID).
138136
OrderExpr("priority DESC, path").
139137
Scan(q.Ctx)
@@ -142,7 +140,7 @@ func (q *Queries) ListDelegationRulesByProject(projectID int) ([]DelegationRule,
142140

143141
func (q *Queries) GetUserIDByEmail(email string) (int, error) {
144142
var id int
145-
err := q.DB.NewSelect().Model((*User)(nil)).Column("id").
143+
err := q.Select((*User)(nil)).Column("id").
146144
Where("lower(email) = lower(?)", email).
147145
Where("is_active = ?", true).
148146
Scan(q.Ctx, &id)

0 commit comments

Comments
 (0)