Merge remote-tracking branch 'openstreetmap/pull/1004'

[rails.git] / lib / tasks / add_version_to_nodes.rake

diff --git a/lib/tasks/add_version_to_nodes.rake b/lib/tasks/add_version_to_nodes.rake
index c0fac49b70768f3c10c83148ca6cb17d7c94cd13..11f639abd191a123d0b9db061b1631dbe38cc980 100644 (file)
--- a/lib/tasks/add_version_to_nodes.rake
+++ b/lib/tasks/add_version_to_nodes.rake
@@ -1,20 +1,18 @@
-namespace 'db' do
-  desc 'Adds a version number to the nodes table'
-  task :node_version  do
-    require File.dirname(__FILE__) + '/../../config/environment'
+namespace "db" do
+  desc "Adds a version number to the nodes table"
+  task :node_version do
+    require File.dirname(__FILE__) + "/../../config/environment"

 
     increment = 1000
     offset = 0
 
     increment = 1000
     offset = 0

-    id_max = OldNode.find(:first, :order => 'id desc').id
+    id_max = OldNode.find(:first, :order => "id desc").id

 
     while offset < (id_max + increment)
       hash = {}
 
       # should be offsetting not selecting
 
     while offset < (id_max + increment)
       hash = {}
 
       # should be offsetting not selecting

-      OldNode.find(:all, :limit => increment, :offset => offset, :order => 'timestamp').each do |node|
-        if hash[node.id].nil?
-          hash[node.id] = []
-        end
+      OldNode.find(:all, :limit => increment, :offset => offset, :order => "timestamp").each do |node|
+        hash[node.id] ||= []

         hash[node.id] << node
       end
 
         hash[node.id] << node
       end
 


@@ -30,7 +28,7 @@ namespace 'db' do
           temp_old_node.timestamp = node.timestamp
           temp_old_node.tile = node.tile
           temp_old_node.version = n
           temp_old_node.timestamp = node.timestamp
           temp_old_node.tile = node.tile
           temp_old_node.version = n

-          temp_old_node.save! || fail
+          temp_old_node.save! || raise

           n += 1
         end
       end
           n += 1
         end
       end