Replace composite_primary_keys with rails builtin support

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

diff --git a/app/models/old_node_tag.rb b/app/models/old_node_tag.rb
index a3e1c3aaf4a49d4a22d291ab942c7cc84b4e0f32..8f632a6713a04eccc5bc8c1bb8873e8b42698b16 100644 (file)
--- a/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@ -9,16 +9,15 @@
 #
 # Foreign Keys
 #
-#  node_tags_id_fkey  (node_id => nodes.node_id)
+#  node_tags_id_fkey  (["node_id", "version"] => nodes.["node_id", "version"])
 #
 
-class OldNodeTag < ActiveRecord::Base
+class OldNodeTag < ApplicationRecord
   self.table_name = "node_tags"
-  self.primary_keys = "node_id", "version", "k"
 
-  belongs_to :old_node, :foreign_key => [:node_id, :version]
+  belongs_to :old_node, :query_constraints => [:node_id, :version], :inverse_of => :old_tags
 
-  validates :old_node, :presence => true, :associated => true
+  validates :old_node, :associated => true
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:node_id, :version] }
 end