Merge remote-tracking branch 'upstream/pull/5667'

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

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

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

 #  timestamp    :datetime         not null
 #  timestamp    :datetime         not null

-#  version      :bigint(8)        not null, primary key
+#  version      :bigint           not null, primary key

 #  visible      :boolean          default(TRUE), not null
 #  redaction_id :integer
 #
 #  visible      :boolean          default(TRUE), not null
 #  redaction_id :integer
 #


@@ -21,10 +21,7 @@
 #
 
 class OldWay < ApplicationRecord
 #
 
 class OldWay < ApplicationRecord

-  include ConsistencyValidations
-

   self.table_name = "ways"
   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.