fix(vault): offset in sql query

semaphoreui · Jan 28, 2024 · 84fdfa4 · 84fdfa4
1 parent 0a31f76
commit 84fdfa4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/db/sql/SqlDb.go b/db/sql/SqlDb.go
@@ -235,6 +235,14 @@ func (d *SqlDb) getObjects(projectID int, props db.ObjectProps, params db.Retrie
 		q = q.OrderBy("pe." + orderColumn + " " + orderDirection)
 	}
 
+	if params.Count > 0 {
+		q = q.Limit(uint64(params.Count))
+	}
+
+	if params.Offset > 0 {
+		q = q.Offset(uint64(params.Offset))
+	}
+
 	query, args, err := q.ToSql()
 
 	if err != nil {

diff --git a/db/sql/access_key.go b/db/sql/access_key.go
@@ -2,6 +2,7 @@ package sql
 
 import (
 	"database/sql"
+	"errors"
 	"github.com/ansible-semaphore/semaphore/db"
 )
 
@@ -115,7 +116,7 @@ func (d *SqlDb) RekeyAccessKeys(oldKey string) (err error) {
 			key.OverrideSecret = true
 			err = d.UpdateAccessKey(key)
 
-			if err != nil {
+			if err != nil && !errors.Is(err, db.ErrNotFound) {
 				return err
 			}
 		}