3
0

Remove paging constraints

This commit is contained in:
Denis Arh
2019-05-04 18:19:07 +02:00
parent d47db8d08f
commit bdfc274087
7 changed files with 10 additions and 11 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ func (r attachment) FindByID(namespaceID, attachmentID uint64) (*types.Attachmen
func (r attachment) Find(filter types.AttachmentFilter) (set types.AttachmentSet, f types.AttachmentFilter, err error) {
f = filter
f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
// f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
query := r.query().
Where(squirrel.Eq{"a.kind": f.Kind})
-1
View File
@@ -76,7 +76,6 @@ func (r chart) FindByID(namespaceID, chartID uint64) (*types.Chart, error) {
func (r chart) Find(filter types.ChartFilter) (set types.ChartSet, f types.ChartFilter, err error) {
f = filter
f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
query := r.query()
-1
View File
@@ -80,7 +80,6 @@ func (r module) FindByID(namespaceID, moduleID uint64) (*types.Module, error) {
func (r module) Find(filter types.ModuleFilter) (set types.ModuleSet, f types.ModuleFilter, err error) {
f = filter
f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
query := r.query()
-1
View File
@@ -79,7 +79,6 @@ func (r *namespace) FindByID(namespaceID uint64) (*types.Namespace, error) {
func (r *namespace) Find(filter types.NamespaceFilter) (set types.NamespaceSet, f types.NamespaceFilter, err error) {
f = filter
f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
query := r.query()
if f.Query != "" {
-1
View File
@@ -97,7 +97,6 @@ func (r page) FindByModuleID(namespaceID, moduleID uint64) (*types.Page, error)
func (r page) Find(filter types.PageFilter) (set types.PageSet, f types.PageFilter, err error) {
f = filter
f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
query := r.query()
+9 -5
View File
@@ -86,9 +86,13 @@ func (r repository) count(q squirrel.SelectBuilder) (uint, error) {
// Fetches paged rows
func (r repository) fetchPaged(set interface{}, q squirrel.SelectBuilder, page, perPage uint) error {
q = q.
Limit(uint64(perPage)).
Offset(uint64(page * perPage))
if perPage > 0 {
q = q.Limit(uint64(perPage))
}
if page > 0 {
q = q.Offset(uint64(page * perPage))
}
if sqlSelect, argsSelect, err := q.ToSql(); err != nil {
return err
@@ -102,11 +106,11 @@ func normalizePerPage(val, min, max, def uint) uint {
return def
}
if val > max {
if max > 0 && val > max {
return max
}
if val < min {
if min > 0 && val < min {
return min
}
-1
View File
@@ -77,7 +77,6 @@ func (r trigger) FindByID(namespaceID, triggerID uint64) (*types.Trigger, error)
func (r trigger) Find(filter types.TriggerFilter) (set types.TriggerSet, f types.TriggerFilter, err error) {
f = filter
f.PerPage = normalizePerPage(f.PerPage, 5, 100, 50)
query := r.query()