Merge character validators

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index 4e0f7ee2df933fb714646e01b54de1b0c4f38b50..c4df0abb53904bf9b733ef5110f698b01dd123df 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -2,7 +2,7 @@
 #
 # Table name: current_way_tags
 #
-#  way_id :bigint(8)        not null, primary key
+#  way_id :integer          not null, primary key
 #  k      :string           default(""), not null, primary key
 #  v      :string           default(""), not null
 #
@@ -18,6 +18,6 @@ class WayTag < ActiveRecord::Base
   belongs_to :way
 
   validates :way, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :way_id }
 end