Merge pull request rails#38564 from kytrinyx/normalize-schema-cache-version-reset

rafaelfranca · web-flow · commit 69d25a5eba67 · 2020-02-24T14:46:38.000-05:00
Normalize resetting schema cache version for YAML and Marshal
diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
@@ -33,11 +33,13 @@ def initialize_dup(other)
       end
 
       def encode_with(coder)
+        reset_version!
+
         coder["columns"]          = @columns
         coder["primary_keys"]     = @primary_keys
         coder["data_sources"]     = @data_sources
         coder["indexes"]          = @indexes
-        coder["version"]          = connection.migration_context.current_version
+        coder["version"]          = @version
         coder["database_version"] = database_version
       end
 
@@ -149,8 +151,8 @@ def dump_to(filename)
       end
 
       def marshal_dump
-        # if we get current version during initialization, it happens stack over flow.
-        @version = connection.migration_context.current_version
+        reset_version!
+
         [@version, @columns, {}, @primary_keys, @data_sources, @indexes, database_version]
       end
 
@@ -162,6 +164,10 @@ def marshal_load(array)
       end
 
       private
+        def reset_version!
+          @version = connection.migration_context.current_version
+        end
+
         def derive_columns_hash_and_deduplicate_values
           @columns      = deep_deduplicate(@columns)
           @columns_hash = @columns.transform_values { |columns| columns.index_by(&:name) }
