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

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 0d32d8c41631402f7b104b6b60b881308a9ab6c5..04ce7abf552e9c2ed4f1565761dd2e531991358c 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -13,11 +13,10 @@
 
 class WayTag < ApplicationRecord
   self.table_name = "current_way_tags"
-  self.primary_keys = "way_id", "k"
 
   belongs_to :way
 
-  validates :way, :presence => true, :associated => true
+  validates :way, :associated => true
   validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :way_id }
 end