Update to rails 3.2.9

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 3f6ac8ce3b5427b5128228e3f49cd218aa6fb84c..98ff62f5f389a4148a3748a9af399cee8a20db91 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,8 +1,11 @@
 class WayTag < ActiveRecord::Base
-  set_table_name 'current_way_tags'
+  self.table_name = "current_way_tags"
+  self.primary_keys = "way_id", "k"
 
-  # false multipart key
-  set_primary_keys :id, :k, :v
-
-  belongs_to :way, :foreign_key => 'id'
+  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
 end