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

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index 9795ff49328b760c304ed587e6df65755006044e..20065b993137f8e1df485c24c81d716371c062ae 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -1,5 +1,23 @@
+# == Schema Information
+#
+# Table name: current_node_tags
+#
+#  node_id :integer          not null, primary key
+#  k       :string           default(""), not null, primary key
+#  v       :string           default(""), not null
+#
+# Foreign Keys
+#
+#  current_node_tags_id_fkey  (node_id => current_nodes.id)
+#
+
 class NodeTag < ActiveRecord::Base
-  set_table_name 'current_node_tags'
+  self.table_name = "current_node_tags"
+  self.primary_keys = "node_id", "k"
+
+  belongs_to :node
 
-  belongs_to :node, :foreign_key => 'id'
+  validates :node, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :node_id }
 end