Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E461C1811A for ; Wed, 11 Nov 2015 22:50:18 +0000 (UTC) Received: (qmail 76938 invoked by uid 500); 11 Nov 2015 22:50:18 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 76847 invoked by uid 500); 11 Nov 2015 22:50:18 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 76420 invoked by uid 99); 11 Nov 2015 22:50:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Nov 2015 22:50:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2578E5703; Wed, 11 Nov 2015 22:50:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Wed, 11 Nov 2015 22:50:32 -0000 Message-Id: <34c162b6d3c047f7b932433f6bcdf77b@git.apache.org> In-Reply-To: <873f97d5f92145deba57447d979ff043@git.apache.org> References: <873f97d5f92145deba57447d979ff043@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/16] couchdb commit: updated refs/heads/2876-js-tests to 805a427 Add keys to options for query The keys option was being added to design doc body. This meant we could not append the keys= option to the view query. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/805a427b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/805a427b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/805a427b Branch: refs/heads/2876-js-tests Commit: 805a427b05472c4eb0b062b6e4b3ed1944a9ec19 Parents: 7e62e9b Author: Tony Sun Authored: Wed Nov 11 14:38:24 2015 -0800 Committer: Tony Sun Committed: Wed Nov 11 14:38:24 2015 -0800 ---------------------------------------------------------------------- test/javascript/couch.js | 2 +- test/javascript/tests/view_multi_key_temp.js | 1 - test/javascript/tests/view_offsets.js | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/805a427b/test/javascript/couch.js ---------------------------------------------------------------------- diff --git a/test/javascript/couch.js b/test/javascript/couch.js index e222b72..53f8c97 100644 --- a/test/javascript/couch.js +++ b/test/javascript/couch.js @@ -141,7 +141,7 @@ function CouchDB(name, httpHeaders, globalRequestOptions) { this.query = function(mapFun, reduceFun, options, keys, language) { var body = {language: language || "javascript"}; if(keys) { - body.keys = keys ; + options.keys = keys ; } if (typeof(mapFun) != "string") { mapFun = mapFun.toSource ? mapFun.toSource() : "(" + mapFun.toString() + ")"; http://git-wip-us.apache.org/repos/asf/couchdb/blob/805a427b/test/javascript/tests/view_multi_key_temp.js ---------------------------------------------------------------------- diff --git a/test/javascript/tests/view_multi_key_temp.js b/test/javascript/tests/view_multi_key_temp.js index 9df0653..25bec4b 100644 --- a/test/javascript/tests/view_multi_key_temp.js +++ b/test/javascript/tests/view_multi_key_temp.js @@ -11,7 +11,6 @@ // the License. couchTests.view_multi_key_temp = function(debug) { - return console.log('TODO'); var db_name = get_random_db_name(); var db = new CouchDB(db_name, {"X-Couch-Full-Commit":"false"}); db.createDb(); http://git-wip-us.apache.org/repos/asf/couchdb/blob/805a427b/test/javascript/tests/view_offsets.js ---------------------------------------------------------------------- diff --git a/test/javascript/tests/view_offsets.js b/test/javascript/tests/view_offsets.js index 39fc77b..5b286c4 100644 --- a/test/javascript/tests/view_offsets.js +++ b/test/javascript/tests/view_offsets.js @@ -11,7 +11,6 @@ // the License. couchTests.view_offsets = function(debug) { - return console.log('TODO'); if (debug) debugger; var db_name = get_random_db_name();