From 4c9ca01ba5903a0e4346f0a0e9e22d5fc0373b2e Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 9 Dec 2010 19:34:30 -0300 Subject: [PATCH] Now really avoiding crash when passing nil to YAML.load() --- db/migrate/20101129234429_convert_folders_to_galleries.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20101129234429_convert_folders_to_galleries.rb b/db/migrate/20101129234429_convert_folders_to_galleries.rb index 5f74a76..4101e6d 100644 --- a/db/migrate/20101129234429_convert_folders_to_galleries.rb +++ b/db/migrate/20101129234429_convert_folders_to_galleries.rb @@ -1,14 +1,14 @@ class ConvertFoldersToGalleries < ActiveRecord::Migration def self.up select_all("select id, setting from articles where type = 'Folder'").each do |folder| - view_as = YAML.load(folder['setting'] || {})[:view_as] + view_as = YAML.load(folder['setting'] || {}.to_yaml)[:view_as] update("update articles set type = 'Gallery' where id = %d" % folder['id']) if view_as == 'image_gallery' end end def self.down select_all("select id, setting from articles where type = 'Gallery'").each do |folder| - settings = YAML.load(folder['setting'] || {}) + settings = YAML.load(folder['setting'] || {}.to_yaml) settings[:view_as] = 'image_gallery' assignments = ActiveRecord::Base.sanitize_sql_for_assignment(:setting => settings.to_yaml) update("update articles set %s, type = 'Folder' where id = %d" % [assignments, folder['id']]) -- libgit2 0.21.2