You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2015/12/12 17:01:38 UTC

[17/35] couchdb commit: updated refs/heads/2876-js-tests-merged to 6d9b2eb

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/9cf1cb8e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9cf1cb8e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9cf1cb8e

Branch: refs/heads/2876-js-tests-merged
Commit: 9cf1cb8ede73f4507bccef28f144e8109f7ab9cb
Parents: 0431c5c
Author: Tony Sun <to...@cloudant.com>
Authored: Wed Nov 11 14:38:24 2015 -0800
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Sat Dec 12 15:25:09 2015 +0100

----------------------------------------------------------------------
 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/9cf1cb8e/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/9cf1cb8e/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/9cf1cb8e/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();