Merge pull request #7 from lbryio/guard_null_mod

tiger5226 · web-flow · commit 3f035a9fe226 · 2019-07-01T23:56:28.000-04:00
Allow null query mods for dynamic queries
diff --git a/queries/qm/query_mods.go b/queries/qm/query_mods.go
@@ -8,7 +8,9 @@ type QueryMod func(q *queries.Query)
 // Apply the query mods to the Query object
 func Apply(q *queries.Query, mods ...QueryMod) {
 	for _, mod := range mods {
-		mod(q)
+		if mod != nil {
+			mod(q)
+		}
 	}
 }
 
@@ -123,13 +125,12 @@ func From(from string) QueryMod {
 	}
 }
 
-func ForceIndex( index string) QueryMod {
+func ForceIndex(index string) QueryMod {
 	return func(q *queries.Query) {
 		queries.SetForceIndex(q, index)
 	}
 }
 
-
 // Limit the number of returned rows
 func Limit(limit int) QueryMod {
 	return func(q *queries.Query) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ type QueryMod func(q *queries.Query)`
`8`	`8`	`// Apply the query mods to the Query object`
`9`	`9`	`func Apply(q *queries.Query, mods ...QueryMod) {`
`10`	`10`	`for _, mod := range mods {`
`11`		`- mod(q)`
	`11`	`+ if mod != nil {`
	`12`	`+ mod(q)`
	`13`	`+ }`
`12`	`14`	`}`
`13`	`15`	`}`
`14`	`16`
`@@ -123,13 +125,12 @@ func From(from string) QueryMod {`
`123`	`125`	`}`
`124`	`126`	`}`
`125`	`127`
`126`		`-func ForceIndex( index string) QueryMod {`
	`128`	`+func ForceIndex(index string) QueryMod {`
`127`	`129`	`return func(q *queries.Query) {`
`128`	`130`	`queries.SetForceIndex(q, index)`
`129`	`131`	`}`
`130`	`132`	`}`
`131`	`133`
`132`		`-`
`133`	`134`	`// Limit the number of returned rows`
`134`	`135`	`func Limit(limit int) QueryMod {`
`135`	`136`	`return func(q *queries.Query) {`