Merge remote-tracking branch 'upstream/pull/3222'

[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 9f4adb147fd6572e83f7c00b6e140c0fc14d3eda..90bf704b6af2c1a5be5eb7c4ea4107d488a16a85 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -1,11 +1,24 @@
-class OldWayTag < ActiveRecord::Base
-  set_table_name 'way_tags'
-  set_primary_keys :way_id, :version, :k
+# == Schema Information
+#
+# Table name: way_tags
+#
+#  way_id  :bigint(8)        default(0), not null, primary key
+#  k       :string           not null, primary key
+#  v       :string           not null
+#  version :bigint(8)        not null, primary key
+#
+# Foreign Keys
+#
+#  way_tags_id_fkey  (way_id => ways.way_id)
+#
+
+class OldWayTag < ApplicationRecord
+  self.table_name = "way_tags"
+  self.primary_keys = "way_id", "version", "k"
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 
-  validates_presence_of :old_way
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => [:way_id, :version]
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+  validates :old_way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => [:way_id, :version] }
 end