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

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index c36d645728a736907596920e0f8e604357069267..9f551d839fc2c57be000f37f67ccd952ec9a313c 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -2,7 +2,7 @@
 #
 # Table name: relations
 #
 #
 # 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
 #  changeset_id :bigint(8)        not null
 #  timestamp    :datetime         not null
 #  version      :bigint(8)        not null, primary key


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

-  include ConsistencyValidations
-

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