Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / db / migrate / 20150330234954_gen_resource_picture_pictures.rb

diff --git a/db/migrate/20150330234954_gen_resource_picture_pictures.rb b/db/migrate/20150330234954_gen_resource_picture_pictures.rb
index b143c95..93c9e50 100644 (file)
--- a/db/migrate/20150330234954_gen_resource_picture_pictures.rb
+++ b/db/migrate/20150330234954_gen_resource_picture_pictures.rb
@@ -1,7 +1,7 @@
 class GenResourcePicturePictures < ActiveRecord::Migration
   def up
-    Picture.find(:all).each do |picture|
-      resource_picture_picture = ResourcePicturePicture.find(:first, {:conditions => ['picture_id = ?', picture.id]})
+    Picture.find_each do |picture|
+      resource_picture_picture = ResourcePicturePicture.where(['picture_id = ?', picture.id]).first
       opid = picture.original_picture ? picture.original_picture.id : nil
       rpid = picture.original_picture.resource_picture ? picture.original_picture.resource_picture.id : nil
       if resource_picture_picture