X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d6b4b8c8a180d0f54201c457e6b70dfdb2acf3e7..766246a9605bfa61cba8c6ef63676c233d206813:/app/models/changeset_tag.rb

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 6a414a0fc..7ffba0dc3 100644
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -1,8 +1,9 @@
 class ChangesetTag < ActiveRecord::Base
-  belongs_to :changeset, :foreign_key => 'id'
+  self.primary_keys = "changeset_id", "k"
 
-  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
+  belongs_to :changeset
+
+  validates :changeset, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :changeset_id }
 end