Merge branch 'master' into openid

[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 b02fd45b93ad8f23ba3aea7271bcef1ddfce5051..801532dbaa7632d2074e33fbb48ac4a5251285a3 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -1,6 +1,10 @@
 class OldWayTag < ActiveRecord::Base
-  belongs_to :user
-
   set_table_name 'way_tags'
 
+  belongs_to :old_way, :foreign_key => [: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
 end