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

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index bdf8cb47ee32438ab875f7c5bc17d5b431fabef5..620cc24d227029091e610bfccb0813bb792c0449 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -24,7 +24,7 @@
 #  nodes_redaction_id_fkey  (redaction_id => redactions.id)
 #
 
-class OldNode < ActiveRecord::Base
+class OldNode < ApplicationRecord
   include GeoRecord
   include ConsistencyValidations
   include ObjectMetadata
@@ -32,7 +32,7 @@ class OldNode < ActiveRecord::Base
   self.table_name = "nodes"
   self.primary_keys = "node_id", "version"
 
-  # note this needs to be included after the table name changes, or
+  # NOTE: this needs to be included after the table name changes, or
   # the queries generated by Redactable will use the wrong table name.
   include Redactable
 
@@ -105,7 +105,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags
-    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h
   end
 
   attr_writer :tags