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 f0c5eea8b9e6900587340ff022d2fb5e42b85440..04ce7abf552e9c2ed4f1565761dd2e531991358c 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,11 +1,22 @@
-class WayTag < ActiveRecord::Base
-  set_table_name 'current_way_tags'
-  set_primary_keys :way_id, :k
+# == 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"
 
   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