Validate user location is sensible

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

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index 0fcb113269ea475fef4438d747ccee8eb9c69e26..052b60853e9ec0f630d9b8ccd5aef59b81c89575 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -1,10 +1,24 @@
+# == Schema Information
+#
+# Table name: relation_tags
+#
+#  relation_id :integer          default(0), not null, primary key
+#  k           :string           default(""), not null, primary key
+#  v           :string           default(""), not null
+#  version     :integer          not null, primary key
+#
+# Foreign Keys
+#
+#  relation_tags_id_fkey  (relation_id => relations.relation_id)
+#
+
 class OldRelationTag < ActiveRecord::Base
-  set_table_name 'relation_tags'
-  
-  belongs_to :old_relation, :foreign_key => [:id, :version]
-  
-  validates_presence_of :id, :version
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => [:k, :version]
-  validates_numericality_of :id, :version, :only_integer => true
+  self.table_name = "relation_tags"
+  self.primary_keys = "relation_id", "version", "k"
+
+  belongs_to :old_relation, :foreign_key => [:relation_id, :version]
+
+  validates :old_relation, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => [:relation_id, :version] }
 end