X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e660e609661edadc1ed5ad49d6e83e936b2f91cd..b87983c2baf55d437c09e668188454d01b5f20b0:/app/models/way_tag.rb

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 98ff62f5f..04ce7abf5 100644
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,11 +1,22 @@
-class WayTag < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: current_way_tags
+#
+#  way_id :bigint(8)        not null, primary key
+#  k      :string           default(""), not null, primary key
+#  v      :string           default(""), not null
+#
+# Foreign Keys
+#
+#  current_way_tags_id_fkey  (way_id => current_ways.id)
+#
+
+class WayTag < ApplicationRecord
   self.table_name = "current_way_tags"
-  self.primary_keys = "way_id", "k"
 
   belongs_to :way
-  
-  validates_presence_of :way
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :way_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+
+  validates :way, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => :way_id }
 end