Merge pull request #4218 from AntonKhorev/no-user-id-renames

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index fcff84ededfe0727120794994b5afc5cdaf04ff6..a55d3ed004a72bc678b959022e60ac33661ec199 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -2,7 +2,7 @@
 #
 # Table name: ways
 #
 #
 # Table name: ways
 #

-#  way_id       :bigint(8)        default(0), not null, primary key
+#  way_id       :bigint(8)        not null, primary key

 #  changeset_id :bigint(8)        not null
 #  timestamp    :datetime         not null
 #  version      :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 OldWay < ApplicationRecord
   include ConsistencyValidations
 
   self.table_name = "ways"
   include ConsistencyValidations
 
   self.table_name = "ways"

-  self.primary_keys = "way_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.
 
   # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.


@@ -34,8 +33,8 @@ class OldWay < ApplicationRecord
   belongs_to :redaction, :optional => true
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
 
   belongs_to :redaction, :optional => true
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
 

-  has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version], :inverse_of => :old_way
-  has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_nodes, :class_name => "OldWayNode", :query_constraints => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_tags, :class_name => "OldWayTag", :query_constraints => [:way_id, :version], :inverse_of => :old_way

 
   validates :changeset, :associated => true
   validates :timestamp, :presence => true
 
   validates :changeset, :associated => true
   validates :timestamp, :presence => true