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

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 5ce7c8fbc4758081282bf9a5098c99a784fb6ec7..8ef75f38e21698b99bb24b63e2cce6d6f0def5e1 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,6 +1,23 @@
+# == Schema Information
+#
+# Table name: current_way_tags
+#
+#  way_id :integer          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 < ActiveRecord::Base
-  set_table_name 'current_way_tags'
+  self.table_name = "current_way_tags"
+  self.primary_keys = "way_id", "k"
 
-  belongs_to :way, :foreign_key => 'id'
+  belongs_to :way
 
+  validates :way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :way_id }
 end