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

[rails.git] / app / models / relation_member.rb

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index 82cb4cc8d288669fdb82ceca90febdaf41375b30..2de551c3f437c2b420574ca84aa58e17f9421bf3 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,27 +1,26 @@
-class RelationMember < ActiveRecord::Base
-  set_table_name 'current_relation_members'
-  
-  set_primary_keys :id, :sequence_id
+# == Schema Information
+#
+# Table name: current_relation_members
+#
+#  relation_id :bigint(8)        not null, primary key
+#  member_type :enum             not null
+#  member_id   :bigint(8)        not null
+#  member_role :string           not null
+#  sequence_id :integer          default(0), not null, primary key
+#
+# Indexes
+#
+#  current_relation_members_member_idx  (member_type,member_id)
+#
+# Foreign Keys
+#
+#  current_relation_members_id_fkey  (relation_id => current_relations.id)
+#
 
-  belongs_to :member, :polymorphic => true
-  belongs_to :relation, :foreign_key => :id
-
-  after_find :set_class_from_type
-  after_initialize :set_class_from_type
-  before_save :set_type_from_class
-
-  def member_type=(type)
-    self[:member_type] = type
-    self[:member_class] = type.capitalize
-  end
+class RelationMember < ApplicationRecord
+  self.table_name = "current_relation_members"
+  self.primary_keys = "relation_id", "sequence_id"
 
-private
-
-  def set_class_from_type
-    self[:member_class] = self.member_type.classify unless self.member_type.nil?
-  end
-
-  def set_type_from_class
-    self.member_type = self[:member_class].classify
-  end
+  belongs_to :relation
+  belongs_to :member, :polymorphic => true
 end