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

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 93c4cdece779776f8a35c09e05636092bbe04bc7..2bf7fa887cd01e176b33f61b7a477694650ee51d 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -2,7 +2,7 @@
 #
 # Table name: current_way_tags
 #
-#  way_id :bigint(8)        not null, primary key
+#  way_id :bigint           not null, primary key
 #  k      :string           default(""), not null, primary key
 #  v      :string           default(""), not null
 #
@@ -13,7 +13,6 @@
 
 class WayTag < ApplicationRecord
   self.table_name = "current_way_tags"
-  self.primary_keys = "way_id", "k"
 
   belongs_to :way