Merge remote-tracking branch 'openstreetmap/pull/1043'

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 4548674d4b950607e2396ecc079da2e3951bba4c..99d435d33a7d78dec9e00af3f38d263d57b2cfc5 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,9 +1,10 @@
 class WayTag < ActiveRecord::Base
-  set_table_name 'current_way_tags'
+  self.table_name = "current_way_tags"
+  self.primary_keys = "way_id", "k"
 
-  # False multipart keys. The following would be a hack:
-  # set_primary_keys :id, :k, :v
-  # FIXME add a real multipart key to waytags so that we can do eager loadin
+  belongs_to :way
 
-  belongs_to :way, :foreign_key => 'id'
+  validates :way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :way_id }
 end