X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c2f23fea6a7821a4ad4c97fd65744b138ec86267..HEAD:/app/models/node_tag.rb

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index d1e800592..18e502439 100644
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -11,13 +11,12 @@
 #  current_node_tags_id_fkey  (node_id => current_nodes.id)
 #
 
-class NodeTag < ActiveRecord::Base
+class NodeTag < ApplicationRecord
   self.table_name = "current_node_tags"
-  self.primary_keys = "node_id", "k"
 
   belongs_to :node
 
-  validates :node, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
+  validates :node, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :node_id }
 end