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

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index 6bc1c555e6e4e79b8cd8923d93f6815ec322a3b6..fa21b1ff6fdd60b2c813e7bd7979ee6b5a140837 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -1,11 +1,23 @@
-class NodeTag < ActiveRecord::Base
-  set_table_name 'current_node_tags'
-  set_primary_keys :node_id, :k
+# == Schema Information
+#
+# Table name: current_node_tags
+#
+#  node_id :bigint(8)        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 < ApplicationRecord
+  self.table_name = "current_node_tags"
+  self.primary_keys = "node_id", "k"
 
   belongs_to :node
-  
-  validates_presence_of :node
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :node_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+
+  validates :node, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => :node_id }
 end