Merge remote-tracking branch 'openstreetmap/pull/891'

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index 6298fbe778e8da9870c41f3f82976ff24287a6c0..7ffba0dc3350c0348c094d4b7ddd0e8893fbeea4 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -1,5 +1,9 @@
 class ChangesetTag < ActiveRecord::Base
+  self.primary_keys = "changeset_id", "k"
 
-  belongs_to :changeset, :foreign_key => 'id'
+  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