diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-11-19 12:37:27 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-11-19 12:37:27 +0000 |
| commit | c05c268204f6c848f08ddb248850fb1aa7acb6a9 (patch) | |
| tree | 7430364b697e54d001871a2725589de35845fb8d | |
| parent | b1978300207a8ba888a85b0302fc98293f54fdb2 (diff) | |
For absolute consistency, renamed aliases start_key_docid and end_key_docid to start_key_doc_id and end_key_doc_id.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1036818 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | share/www/script/test/view_pagination.js | 10 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 4 |
3 files changed, 9 insertions, 9 deletions
@@ -40,8 +40,8 @@ View Server: returning a `stale=ok` response. * Warn about empty result caused by `startkey` and `endkey` limiting. * Built-in reduce function `_sum` now accepts lists of integers as input. - * Added view query aliases start_key, end_key, start_key_docid and - end_key_docid. + * Added view query aliases start_key, end_key, start_key_doc_id and + end_key_doc_id. Version 1.0.1 ------------- diff --git a/share/www/script/test/view_pagination.js b/share/www/script/test/view_pagination.js index 4f9cfe2c..ed3a7ee1 100644 --- a/share/www/script/test/view_pagination.js +++ b/share/www/script/test/view_pagination.js @@ -37,10 +37,10 @@ couchTests.view_pagination = function(debug) { T(queryResults.rows[j].key == i + j); } - // test aliases start_key and start_key_docid + // test aliases start_key and start_key_doc_id queryResults = db.query(queryFun, null, { start_key: i, - start_key_docid: i, + start_key_doc_id: i, limit: 10 }); T(queryResults.rows.length == 10); @@ -135,12 +135,12 @@ couchTests.view_pagination = function(debug) { }); testEndkeyDocId(queryResults); - // test aliases end_key_docid and end_key + // test aliases end_key_doc_id and end_key queryResults = db.query(function(doc) { emit(null, null); }, null, { start_key: null, - start_key_docid: 1, + start_key_doc_id: 1, end_key: null, - end_key_docid: 40 + end_key_doc_id: 40 }); testEndkeyDocId(queryResults); diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index 5ac73af3..8656c43e 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -272,12 +272,12 @@ parse_view_param("key", Value) -> % TODO: maybe deprecate startkey_docid parse_view_param("startkey_docid", Value) -> [{start_docid, ?l2b(Value)}]; -parse_view_param("start_key_docid", Value) -> +parse_view_param("start_key_doc_id", Value) -> [{start_docid, ?l2b(Value)}]; % TODO: maybe deprecate endkey_docid parse_view_param("endkey_docid", Value) -> [{end_docid, ?l2b(Value)}]; -parse_view_param("end_key_docid", Value) -> +parse_view_param("end_key_doc_id", Value) -> [{end_docid, ?l2b(Value)}]; % TODO: maybe deprecate startkey parse_view_param("startkey", Value) -> |