Merge branch 'pull/3472'

[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 9e03d34f983a86553d6ca2fb3b8c7ff5d8472056..c710e48f133db67436fbe0b86ff9f94ce4c2a9ea 100644 (file)
--- a/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@ -2,8 +2,8 @@
 #
 # Table name: node_tags
 #
-#  node_id :integer          not null, primary key
-#  version :integer          not null, primary key
+#  node_id :bigint(8)        not null, primary key
+#  version :bigint(8)        not null, primary key
 #  k       :string           default(""), not null, primary key
 #  v       :string           default(""), not null
 #
@@ -12,13 +12,13 @@
 #  node_tags_id_fkey  (node_id => nodes.node_id)
 #
 
-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, :foreign_key => [:node_id, :version], :inverse_of => :old_tags
 
-  validates :old_node, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :old_node, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => [:node_id, :version] }
 end