Combine the address and netmask for an ACL in one column

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index fa9b4336177061287d00d4b153a9da6cef28c6a9..f0c5eea8b9e6900587340ff022d2fb5e42b85440 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,14 +1,11 @@
 class WayTag < ActiveRecord::Base
   set_table_name 'current_way_tags'
+  set_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, :foreign_key => 'id'
+  belongs_to :way
   
-  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
+  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