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

[rails.git] / db / migrate / 024_order_relation_members.rb

diff --git a/db/migrate/024_order_relation_members.rb b/db/migrate/024_order_relation_members.rb
index 5500edfcfbf4ac42e9a35e9d754dfdc049a96a47..77ef3a55967aabfd886c444dab4dbb11b1c14c1a 100644 (file)
--- a/db/migrate/024_order_relation_members.rb
+++ b/db/migrate/024_order_relation_members.rb
@@ -1,16 +1,16 @@
-class OrderRelationMembers < ActiveRecord::Migration
+class OrderRelationMembers < ActiveRecord::Migration[4.2]

   def self.up
     # add sequence column. rails won't let us define an ordering here,
     # as defaults must be constant.
     add_column(:relation_members, :sequence_id, :integer,
                :default => 0, :null => false)
 
   def self.up
     # add sequence column. rails won't let us define an ordering here,
     # as defaults must be constant.
     add_column(:relation_members, :sequence_id, :integer,
                :default => 0, :null => false)
 

-    # update the sequence column with default (partial) ordering by 
+    # update the sequence column with default (partial) ordering by

     # element ID. the sequence ID is a smaller int type, so we can't
     # just copy the member_id.
     execute("update relation_members set sequence_id = mod(member_id, 16384)")
 
     # element ID. the sequence ID is a smaller int type, so we can't
     # just copy the member_id.
     execute("update relation_members set sequence_id = mod(member_id, 16384)")
 

-    # need to update the primary key to include the sequence number, 
+    # need to update the primary key to include the sequence number,

     # otherwise the primary key will barf when we have repeated members.
     # mysql barfs on this anyway, so we need a single command. this may
     # not work in postgres... needs testing.
     # otherwise the primary key will barf when we have repeated members.
     # mysql barfs on this anyway, so we need a single command. this may
     # not work in postgres... needs testing.