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

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

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index c674f708bc0214a097ccc27172a7bea0d7a2e488..31399c00d1dafefa296610403408b55bd918329a 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -2,23 +2,22 @@
 #
 # Table name: relation_tags
 #
-#  relation_id :bigint(8)        default(0), not null, primary key
+#  relation_id :bigint(8)        not null, primary key
 #  k           :string           default(""), not null, primary key
 #  v           :string           default(""), not null
 #  version     :bigint(8)        not null, primary key
 #
 # Foreign Keys
 #
-#  relation_tags_id_fkey  (relation_id => relations.relation_id)
+#  relation_tags_id_fkey  (["relation_id", "version"] => relations.["relation_id", "version"])
 #
 
-class OldRelationTag < ActiveRecord::Base
+class OldRelationTag < ApplicationRecord
   self.table_name = "relation_tags"
-  self.primary_keys = "relation_id", "version", "k"
 
-  belongs_to :old_relation, :foreign_key => [:relation_id, :version]
+  belongs_to :old_relation, :query_constraints => [:relation_id, :version], :inverse_of => :old_tags
 
-  validates :old_relation, :presence => true, :associated => true
+  validates :old_relation, :associated => true
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:relation_id, :version] }
 end