deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Disabling reset_design_doc to avoid conflict errors

Browse source
This commit is contained in:
Sam Lown 2010-04-14 20:47:26 +00:00
parent ab6d833397
commit 0e282f0727
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/couchrest/mixins/design_doc.rb
View file

@ -60,7 +60,7 @@ module CouchRest
def refresh_design_doc(db = database)
raise "Database missing for design document refresh" if db.nil?
unless design_doc_fresh(db)
reset_design_doc
#reset_design_doc(db)
save_design_doc(db)
design_doc_fresh(db, true)
end
@ -91,8 +91,9 @@ module CouchRest
end
end
def reset_design_doc
current = stored_design_doc
# Depricated (not very useful)
def reset_design_doc(db = database)
current = stored_design_doc(db)
design_doc['_id'] = design_doc_id
if current.nil?
design_doc.delete('_rev')
@ -104,7 +105,7 @@ module CouchRest
# Writes out a design_doc to a given database, returning the
# updated design doc
def update_design_doc(design_doc, db, force = false)
saved = stored_design_doc
saved = stored_design_doc(db)
if saved
# Perform Hash comparison on views, only part that interests us
if force || design_doc['views'] != saved['views']