@@ -1,6 +1,7 @@ +Balint Erdi David Lee Frederick Cheung James Rosen Niket Patel Paul Carey -Priit Tamboom +Priit Tamboom \ No newline at end of file CONTRIBUTORS @@ -16,7 +16,7 @@ module RelaxDB def __getobj__ unless @objs - @objs = RelaxDB.view "#{@class_name}_all", @params + @objs = RelaxDB.rf_view "#{@class_name}_all", @params end @objs end lib/relaxdb/all_delegator.rb @@ -538,11 +538,11 @@ module RelaxDB define_method by_name do |*params| view_name = "#{self.name}_#{by_name}" if params.empty? - res = RelaxDB.view view_name, opts + res = RelaxDB.rf_view view_name, opts elsif params[0].is_a? Hash - res = RelaxDB.view view_name, opts.merge(params[0]) + res = RelaxDB.rf_view view_name, opts.merge(params[0]) else - res = RelaxDB.view(view_name, :key => params[0]).first + res = RelaxDB.rf_view(view_name, :key => params[0]).first end end end lib/relaxdb/document.rb @@ -80,7 +80,7 @@ module RelaxDB end params[:limit] = 1 - RelaxDB.view(view_name, params).offset + RelaxDB.rf_view(view_name, params).offset end end lib/relaxdb/paginator.rb @@ -22,13 +22,9 @@ module RelaxDB end end - def initialize(view_name, params = {}) - # CouchDB defaults reduce to true when a reduce func is present - # but returning the map view is typically more useful - reduce(false) - + def initialize view_name, params = {} @view_name = view_name - params.each { |k, v| send(k, v) } + params.each { |k, v| send k, v } end def keys(keys=nil) lib/relaxdb/query.rb @@ -145,6 +145,22 @@ module RelaxDB res end + + # + # CouchDB defaults reduce to true when a reduce func is present. + # RelaxDB used to indiscriminately set reduce=false, allowing clients to override + # if desired. However, as of CouchDB 0.10, such behaviour results in + # {"error":"query_parse_error","reason":"Invalid URL parameter `reduce` for map view."} + # View https://issues.apache.org/jira/browse/COUCHDB-383#action_12722350 + # + # This method is an internal workaround for this change to CouchDB and may + # be removed if a future change allows for a better solution e.g. map=true + # or a _map endpoint + # + def rf_view view_name, params + params[:reduce] = false + view view_name, params + end def view(view_name, params = {}) q = Query.new(view_name, params) @@ -185,7 +201,8 @@ module RelaxDB raise paginate_params.error_msg if paginate_params.invalid? paginator = Paginator.new(paginate_params, page_params) - + + atts[:reduce] = false query = Query.new(view_name, atts) query.merge(paginate_params) lib/relaxdb/relaxdb.rb @@ -24,55 +24,55 @@ describe RelaxDB::Query do it "should list design document and view name and default reduce to false" do q = RelaxDB::Query.new("mount") - q.view_path.should == "_design//_view/mount?reduce=false" + q.view_path.should == "_design//_view/mount" end it "should contain URL and JSON encoded key when the key has been set" do q = RelaxDB::Query.new("") q.key("olympus") - q.view_path.should == "_design//_view/?key=%22olympus%22&reduce=false" + q.view_path.should == "_design//_view/?key=%22olympus%22" end it "should honour startkey, endkey and limit" do q = RelaxDB::Query.new("") q.startkey(["olympus"]).endkey(["vesuvius", 3600]).limit(100) - q.view_path.should == "_design//_view/?startkey=%5B%22olympus%22%5D&endkey=%5B%22vesuvius%22%2C3600%5D&limit=100&reduce=false" + q.view_path.should == "_design//_view/?startkey=%5B%22olympus%22%5D&endkey=%5B%22vesuvius%22%2C3600%5D&limit=100" end it "should specify a null key if key was set to nil" do q = RelaxDB::Query.new("") q.key(nil) - q.view_path.should == "_design//_view/?key=null&reduce=false" + q.view_path.should == "_design//_view/?key=null" end it "should specify a null startkey if startkey was set to nil" do q = RelaxDB::Query.new("") q.startkey(nil) - q.view_path.should == "_design//_view/?startkey=null&reduce=false" + q.view_path.should == "_design//_view/?startkey=null" end it "should specify a null endkey if endkey was set to nil" do q = RelaxDB::Query.new("") q.endkey(nil) - q.view_path.should == "_design//_view/?endkey=null&reduce=false" + q.view_path.should == "_design//_view/?endkey=null" end it "should not JSON encode the startkey_docid" do q = RelaxDB::Query.new("") q.startkey_docid("foo") - q.view_path.should == "_design//_view/?startkey_docid=foo&reduce=false" + q.view_path.should == "_design//_view/?startkey_docid=foo" end it "should not JSON encode the endkey_docid" do q = RelaxDB::Query.new("") q.endkey_docid("foo") - q.view_path.should == "_design//_view/?endkey_docid=foo&reduce=false" + q.view_path.should == "_design//_view/?endkey_docid=foo" end it "should not include design or view if it starts with a _" do q = RelaxDB::Query.new "_" # q.view_path.should == "_" - q.view_path.should == "_?reduce=false" + q.view_path.should == "_" end end spec/query_spec.rb cb7ddf9015d2cf551f5c790397546260d93fbe68 Paul Carey paul.p.carey@gmail.com http://github.com/paulcarey/relaxdb/commit/f09e6ccf0d4ba379fc6c136a3ea26d4a397b6ee2 f09e6ccf0d4ba379fc6c136a3ea26d4a397b6ee2 2009-08-15T02:48:38-07:00 2009-08-15T02:48:38-07:00 Removed default query param of reduce=false as setting reduce if only a map function exists results in an error on the CouchDB 0.10 branch. Based off work by Balint Erdi. 6cf19e7eda4719c817779d79c69b697e8d383a3f Paul Carey paul.p.carey@gmail.com