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

[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 ef32a0613f3a9aa08df97d9b13d809c4a6f509a5..9e03d34f983a86553d6ca2fb3b8c7ff5d8472056 100644 (file)
--- a/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@ -1,9 +1,24 @@
-class OldNodeTag < ActiveRecord::Base
-  belongs_to :user
+# == Schema Information
+#
+# Table name: node_tags
+#
+#  node_id :integer          not null, primary key
+#  version :integer          not null, primary key
+#  k       :string           default(""), not null, primary key
+#  v       :string           default(""), not null
+#
+# Foreign Keys
+#
+#  node_tags_id_fkey  (node_id => nodes.node_id)
+#
 
-  set_table_name 'node_tags'
+class OldNodeTag < ActiveRecord::Base
+  self.table_name = "node_tags"
+  self.primary_keys = "node_id", "version", "k"
 
-  validates_presence_of :id, :version
-  validates_length_of :k, :v, :within => 0..255, :allow_blank => true
+  belongs_to :old_node, :foreign_key => [:node_id, :version]
 
+  validates :old_node, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => [:node_id, :version] }
 end