X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2cd7af7e0b2ad97687849576ed4e3f52c37a6d55..3ea2c30c58bb23247296fc212fcf7426668248a6:/app/models/old_relation.rb

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index e948cae5e..5ff12fd58 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -2,7 +2,7 @@
 #
 # Table name: relations
 #
-#  relation_id  :bigint(8)        default(0), not null, primary key
+#  relation_id  :bigint(8)        not null, primary key
 #  changeset_id :bigint(8)        not null
 #  timestamp    :datetime         not null
 #  version      :bigint(8)        not null, primary key
@@ -24,7 +24,6 @@ class OldRelation < ApplicationRecord
   include ConsistencyValidations
 
   self.table_name = "relations"
-  self.primary_keys = "relation_id", "version"
 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.
@@ -32,12 +31,12 @@ class OldRelation < ApplicationRecord
 
   belongs_to :changeset
   belongs_to :redaction, :optional => true
-  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
+  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations
 
-  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version]
-  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version]
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :query_constraints => [:relation_id, :version], :inverse_of => :old_relation
+  has_many :old_tags, :class_name => "OldRelationTag", :query_constraints => [:relation_id, :version], :inverse_of => :old_relation
 
-  validates :changeset, :presence => true, :associated => true
+  validates :changeset, :associated => true
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 
@@ -99,7 +98,7 @@ class OldRelation < ApplicationRecord
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
-  def is_latest_version?
+  def latest_version?
     current_relation.version == version
   end
 end