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

[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 49324966f506c2624f0055d9f02fc5f82f2e6911..31399c00d1dafefa296610403408b55bd918329a 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -1,11 +1,23 @@
-class OldRelationTag < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: relation_tags
+#
+#  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", "version"] => relations.["relation_id", "version"])
+#
+
+class OldRelationTag < ApplicationRecord
   self.table_name = "relation_tags"
-  self.primary_keys = "relation_id", "version", "k"
 
-  belongs_to :old_relation, :foreign_key => [:relation_id, :version]
-  
-  validates_presence_of :old_relation
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => [:relation_id, :version]
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+  belongs_to :old_relation, :query_constraints => [:relation_id, :version], :inverse_of => :old_tags
+
+  validates :old_relation, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => [:relation_id, :version] }
 end