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

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

diff --git a/app/models/old_way_tag.rb b/app/models/old_way_tag.rb
index 801532dbaa7632d2074e33fbb48ac4a5251285a3..69bd2b1861d12d845d2c3716f8fd651311d781c1 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -1,10 +1,10 @@
 class OldWayTag < ActiveRecord::Base
-  set_table_name 'way_tags'
+  self.table_name = "way_tags"
+  self.primary_keys = "way_id", "version", "k"
 
-  belongs_to :old_way, :foreign_key => [:id, :version]
+  belongs_to :old_way, :foreign_key => [:way_id, :version]
 
-  validates_presence_of :id
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => [:k, :version]
-  validates_numericality_of :id, :version, :only_integer => true
+  validates :old_way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => [:way_id, :version] }
 end