Simplify URL scheme name matching in OAuth callback URLs a little

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 5ce7c8fbc4758081282bf9a5098c99a784fb6ec7..fa9b4336177061287d00d4b153a9da6cef28c6a9 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,6 +1,14 @@
 class WayTag < ActiveRecord::Base
   set_table_name 'current_way_tags'
 
-  belongs_to :way, :foreign_key => 'id'
+  # 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, :foreign_key => 'id'
+  
+  validates_presence_of :id
+  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
+  validates_uniqueness_of :id, :scope => :k
+  validates_numericality_of :id, :only_integer => true
 end