Merge remote-tracking branch 'upstream/pull/4762'

[rails.git] / db / migrate / 20120208122334_merge_acl_address_and_mask.rb

diff --git a/db/migrate/20120208122334_merge_acl_address_and_mask.rb b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
index 791bf659a9023ce5da57eb3c0c9a29d0a3c5be52..5cac1074051770992b7ede7a6c9f35f6e92f65ac 100644 (file)
--- a/db/migrate/20120208122334_merge_acl_address_and_mask.rb
+++ b/db/migrate/20120208122334_merge_acl_address_and_mask.rb
@@ -10,7 +10,10 @@ class IPAddr
   end
 end
 
-class MergeAclAddressAndMask < ActiveRecord::Migration
+class MergeAclAddressAndMask < ActiveRecord::Migration[4.2]
+  class Acl < ApplicationRecord
+  end
+
   def up
     Acl.find_each do |acl|
       address = IPAddr.new(acl.address)
@@ -18,8 +21,8 @@ class MergeAclAddressAndMask < ActiveRecord::Migration
       prefix = 0
 
       while netmask != "0.0.0.0"
-        netmask = netmask << 1
-        prefix = prefix + 1
+        netmask <<= 1
+        prefix += 1
       end
 
       acl.address = "#{address.mask(prefix)}/#{prefix}"