Download as
Browse Code »

Commit ce57b69f4d755c3687e497d314947d61477223d9

Authored by Antonio Terceiro
1 parent 62bac6f2
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Avoiding crash when passing nil to YAML.load() 

(ActionItem1769)
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
db/migrate/20101129234429_convert_folders_to_galleries.rb
  Diff comments   View file @ce57b69
1 class ConvertFoldersToGalleries < ActiveRecord::Migration 1 class ConvertFoldersToGalleries < ActiveRecord::Migration
2 def self.up 2 def self.up
3 select_all("select id, setting from articles where type = 'Folder'").each do |folder| 3 select_all("select id, setting from articles where type = 'Folder'").each do |folder|
4 - view_as = YAML.load(folder['setting'])[:view_as] 4 + view_as = YAML.load(folder['setting'] || {})[:view_as]
5 update("update articles set type = 'Gallery' where id = %d" % folder['id']) if view_as == 'image_gallery' 5 update("update articles set type = 'Gallery' where id = %d" % folder['id']) if view_as == 'image_gallery'
6 end 6 end
7 end 7 end
8 8
9 def self.down 9 def self.down
10 select_all("select id, setting from articles where type = 'Gallery'").each do |folder| 10 select_all("select id, setting from articles where type = 'Gallery'").each do |folder|
11 - settings = YAML.load(folder['setting']) 11 + settings = YAML.load(folder['setting'] || {})
12 settings[:view_as] = 'image_gallery' 12 settings[:view_as] = 'image_gallery'
13 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml) 13 assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml)
14 update("update articles set %s, type = 'Folder' where id = %d" % [assignments, folder['id']]) 14 update("update articles set %s, type = 'Folder' where id = %d" % [assignments, folder['id']])