From: Tom Hughes <tom@compton.nu>
Date: Thu, 24 Apr 2014 23:41:39 +0000 (+0100)
Subject: Modernise use of find and update_all in database migrations
X-Git-Tag: live~4400
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/360333d37d56624bacde6032aeb2876638c03552?hp=1a38e9b3153db74626671b6727c7c139a249bf09

Modernise use of find and update_all in database migrations
---

diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb
index db17f3c35..af4b65123 100644
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -24,7 +24,7 @@ class UserEnhancements < ActiveRecord::Migration
     add_index "user_tokens", ["token"], :name => "user_tokens_token_idx", :unique => true
     add_index "user_tokens", ["user_id"], :name => "user_tokens_user_id_idx"
 
-    User.find(:all, :conditions => "token is not null").each do |user|
+    User.where("token is not null").each do |user|
       UserToken.create(:user_id => user.id, :token => user.token, :expiry => 1.week.from_now)
     end
 
diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb
index 91d590726..d429b6fdc 100644
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -9,7 +9,7 @@ class TileTracepoints < ActiveRecord::Migration
     if ENV["USE_DB_FUNCTIONS"]
       Tracepoint.update_all("latitude = latitude * 10, longitude = longitude * 10, tile = tile_for_point(latitude * 10, longitude * 10)")
     else
-      Tracepoint.find(:all).each do |tp|
+      Tracepoint.all.each do |tp|
         tp.latitude = tp.latitude * 10
         tp.longitude = tp.longitude * 10
         tp.save!
diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index b56a095a4..91f8acb6b 100644
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -19,7 +19,7 @@ class TileNodes < ActiveRecord::Migration
       FROM #{from_table}
       END_SQL
 
-      model.find(:all).each do |n|
+      model.all.each do |n|
         n.save!
       end
     end
diff --git a/db/migrate/039_add_more_controls_to_gpx_files.rb b/db/migrate/039_add_more_controls_to_gpx_files.rb
index 7cc485e6b..aa2050e78 100644
--- a/db/migrate/039_add_more_controls_to_gpx_files.rb
+++ b/db/migrate/039_add_more_controls_to_gpx_files.rb
@@ -4,7 +4,7 @@ class AddMoreControlsToGpxFiles < ActiveRecord::Migration
   def self.up
     create_enumeration :gpx_visibility_enum, ["private", "public", "trackable", "identifiable"]
     add_column :gpx_files, :visibility, :gpx_visibility_enum, :default => "public", :null => false
-    Trace.update_all("visibility = 'private'", { :public => false })
+    Trace.where(:public => false).update_all(:visibility => "private")
     add_index :gpx_files, [:visible, :visibility], :name => "gpx_files_visible_visibility_idx"
     remove_index :gpx_files, :name => "gpx_files_visible_public_idx"
     remove_column :gpx_files, :public
@@ -12,7 +12,7 @@ class AddMoreControlsToGpxFiles < ActiveRecord::Migration
 
   def self.down
     add_column :gpx_files, :public, :boolean, :default => true, :null => false
-    Trace.update_all("public = false", { :visibility => "private" })
+    Trace.where(:visibility => "private").update_all(:public => false)
     add_index :gpx_files, [:visible, :public], :name => "gpx_files_visible_public_idx"
     remove_index :gpx_files, :name => "gpx_files_visible_visibility_idx"
     remove_column :gpx_files, :visibility
diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb
index 6544bbba1..0db3ea77e 100644
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -11,7 +11,7 @@ class CreateUserRoles < ActiveRecord::Migration
     end
     add_column :user_roles, :role, :user_role_enum, :null => false
 
-    User.all(:conditions => ['administrator = ?', true]).each do |user|
+    User.where(:administrator => true).each do |user|
       UserRole.create(:user_id => user.id, :role => "administrator")
     end
     remove_column :users, :administrator
@@ -21,7 +21,7 @@ class CreateUserRoles < ActiveRecord::Migration
 
   def self.down
     add_column :users, :administrator, :boolean, :default => false, :null => false
-    UserRole.all(:conditions => ['role = ?', "administrator"]).each do |role|
+    UserRole.where(:role => "administrator").each do |role|
       user = User.find(role.user_id)
       user.administrator = true
       user.save!
diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb
index 01d501d01..e79246f48 100644
--- a/db/migrate/051_add_status_to_user.rb
+++ b/db/migrate/051_add_status_to_user.rb
@@ -6,9 +6,9 @@ class AddStatusToUser < ActiveRecord::Migration
 
     add_column :users, :status, :user_status_enum, :null => false, :default => "pending"
 
-    User.update_all("status = 'deleted'", { :visible => false })
-    User.update_all("status = 'pending'", { :visible => true, :active => 0 })
-    User.update_all("status = 'active'", { :visible => true, :active => 1 })
+    User.where(:visible => false).update_all(:status => "deleted")
+    User.where(:visible => true, :active => 0).update_all(:status => "pending")
+    User.where(:visible => true, :active => 1).update_all(:status => "active")
 
     remove_column :users, :active
     remove_column :users, :visible
@@ -18,9 +18,9 @@ class AddStatusToUser < ActiveRecord::Migration
     add_column :users, :visible, :boolean, :default => true, :null => false
     add_column :users, :active, :integer, :default => 0, :null => false
 
-    User.update_all("visible = true, active = 1", { :status => "active" })
-    User.update_all("visible = true, active = 0", { :status => "pending" })
-    User.update_all("visible = false, active = 1", { :status => "deleted" })
+    User.where(:status => "active").update_all(:visible => true, :active => 1)
+    User.where(:status => "pending").update_all(:visible => true, :active => 0)
+    User.where(:status => "deleted").update_all(:visible => false, :active => 1)
 
     remove_column :users, :status