Merge pull request #977 from go-kivik/viewOptions

Improve view options, part 1

x/sqlite/changes.go

@@ -76,16 +76,30 @@ func (d *db) newNormalChanges(ctx context.Context, opts optsMap, since, lastSeq
 		c.lastSeq = strconv.FormatUint(*lastSeq, 10)
 	}
 
+	descending, err := opts.descending()
+	if err != nil {
+		return nil, err
+	}
+
+	includeDocs, err := opts.includeDocs()
+	if err != nil {
+		return nil, err
+	}
+
 	var query string
-	if opts.includeDocs() {
-		query = d.normalChangesQueryWithDocs(descendingToDirection(opts.descending()))
+	if includeDocs {
+		query = d.normalChangesQueryWithDocs(descendingToDirection(descending))
 	} else {
-		query = d.normalChangesQueryWithoutDocs(descendingToDirection(opts.descending()))
+		query = d.normalChangesQueryWithoutDocs(descendingToDirection(descending))
 	}
 	if limit > 0 {
 		query += " LIMIT " + strconv.FormatUint(limit+1, 10)
 	}
-	c.rows, err = d.db.QueryContext(ctx, query, since, opts.attachments()) //nolint:rowserrcheck,sqlclosecheck // Err checked in Next
+	attachments, err := opts.attachments()
+	if err != nil {
+		return nil, err
+	}
+	c.rows, err = d.db.QueryContext(ctx, query, since, attachments) //nolint:rowserrcheck,sqlclosecheck // Err checked in Next
 	if err != nil {
 		return nil, err
 	}
@@ -345,8 +359,16 @@ func (d *db) Changes(ctx context.Context, options driver.Options) (driver.Change
 	if err != nil {
 		return nil, err
 	}
+	includeDocs, err := opts.includeDocs()
+	if err != nil {
+		return nil, err
+	}
 	if sinceNow && feed == feedLongpoll {
-		return d.newLongpollChanges(ctx, opts.includeDocs(), opts.attachments())
+		attachments, err := opts.attachments()
+		if err != nil {
+			return nil, err
+		}
+		return d.newLongpollChanges(ctx, includeDocs, attachments)
 	}
 
 	return d.newNormalChanges(ctx, opts, since, lastSeq, sinceNow, feed)

x/sqlite/changes_test.go

@@ -144,7 +144,7 @@ func TestDBChanges(t *testing.T) {
 	})
 	tests.Add("malformed sequence id", test{
 		options:    kivik.Param("since", "invalid"),
-		wantErr:    "malformed sequence supplied in 'since' parameter",
+		wantErr:    "malformed sequence supplied in 'since' parameter: invalid",
 		wantStatus: http.StatusBadRequest,
 	})
 	tests.Add("future since value returns only latest change", func(t *testing.T) interface{} {
@@ -192,7 +192,7 @@ func TestDBChanges(t *testing.T) {
 	})
 	tests.Add("invalid limit value", test{
 		options:    kivik.Param("limit", "invalid"),
-		wantErr:    "malformed 'limit' parameter",
+		wantErr:    "invalid value for 'limit': invalid",
 		wantStatus: http.StatusBadRequest,
 	})
 	tests.Add("longpoll + since in past should return all historical changes since that seqid", func(t *testing.T) interface{} {

x/sqlite/get.go

@@ -49,7 +49,11 @@ func (d *db) Get(ctx context.Context, id string, options driver.Options) (*drive
 		toMerge.LocalSeq = 0
 	}
 
-	if opts.conflicts() {
+	conflicts, err := opts.conflicts()
+	if err != nil {
+		return nil, err
+	}
+	if conflicts {
 		revs, err := d.conflicts(ctx, tx, id, r, false)
 		if err != nil {
 			return nil, err
@@ -136,7 +140,11 @@ func (d *db) Get(ctx context.Context, id string, options driver.Options) (*drive
 		}
 	}
 
-	atts, err := d.getAttachments(ctx, tx, id, r, opts.attachments(), opts.attsSince())
+	attachments, err := opts.attachments()
+	if err != nil {
+		return nil, err
+	}
+	atts, err := d.getAttachments(ctx, tx, id, r, attachments, opts.attsSince())
 	if err != nil {
 		return nil, err
 	}