Skip to content

Commit 84fdfa4

Browse files
committed
fix(vault): offset in sql query
1 parent 0a31f76 commit 84fdfa4

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

db/sql/SqlDb.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,14 @@ func (d *SqlDb) getObjects(projectID int, props db.ObjectProps, params db.Retrie
235235
q = q.OrderBy("pe." + orderColumn + " " + orderDirection)
236236
}
237237

238+
if params.Count > 0 {
239+
q = q.Limit(uint64(params.Count))
240+
}
241+
242+
if params.Offset > 0 {
243+
q = q.Offset(uint64(params.Offset))
244+
}
245+
238246
query, args, err := q.ToSql()
239247

240248
if err != nil {

db/sql/access_key.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package sql
22

33
import (
44
"database/sql"
5+
"errors"
56
"github.com/ansible-semaphore/semaphore/db"
67
)
78

@@ -115,7 +116,7 @@ func (d *SqlDb) RekeyAccessKeys(oldKey string) (err error) {
115116
key.OverrideSecret = true
116117
err = d.UpdateAccessKey(key)
117118

118-
if err != nil {
119+
if err != nil && !errors.Is(err, db.ErrNotFound) {
119120
return err
120121
}
121122
}

0 commit comments

Comments
 (0)