Skip to content

Commit

Permalink
Merge branch 'release-0.15.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
albrow committed Mar 1, 2016
2 parents 8079803 + fc40dd7 commit cefea1c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Zoom
====

[![Version](https://img.shields.io/badge/version-0.15.0-5272B4.svg)](https://github.com/albrow/zoom/releases)
[![Version](https://img.shields.io/badge/version-0.15.1-5272B4.svg)](https://github.com/albrow/zoom/releases)
[![Circle CI](https://img.shields.io/circleci/project/albrow/zoom/master.svg)](https://circleci.com/gh/albrow/zoom/tree/master)
[![GoDoc](https://godoc.org/github.com/albrow/zoom?status.svg)](https://godoc.org/github.com/albrow/zoom)

Expand Down
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// atomic transactions, lua scripts, and running Redis commands
// directly if needed.
//
// Version 0.15.0
// Version 0.15.1
//
// For installation instructions, examples, and more information
// visit https://github.com/albrow/zoom.
Expand Down
3 changes: 3 additions & 0 deletions query.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ func (collection *Collection) NewQuery() *Query {
// future versions.
if !collection.index {
q.setError(fmt.Errorf("zoom: error in NewQuery: Only indexed collections are queryable. To index the collection, pass CollectionOptions to the NewCollection method."))
return q
}
return q
}
Expand Down Expand Up @@ -183,6 +184,7 @@ func (q *Query) Order(fieldName string) *Query {
if q.hasOrder() {
// TODO: allow secondary sort orders?
q.setError(errors.New("zoom: error in Query.Order: previous order already specified. Only one order per query is allowed."))
return q
}
// Check for the presence of the "-" prefix
var orderKind orderKind
Expand All @@ -198,6 +200,7 @@ func (q *Query) Order(fieldName string) *Query {
if !found {
err := fmt.Errorf("zoom: error in Query.Order: could not find field %s in type %s", fieldName, q.collection.spec.typ.String())
q.setError(err)
return q
}
q.order = order{
fieldName: fs.name,
Expand Down

0 comments on commit cefea1c

Please sign in to comment.