online_migrations 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '029dd11fe1935f72c4933c081b45c972613caa252c578a005b34a902122923d6'
-  data.tar.gz: 04d66e91c1c54f1fe19d8a743d4b6f70ef218bbe2310eb58a779602a92e72736
+  metadata.gz: 1194e93630871eb20ffe647cbc6b7bea10a608e5cfdb9060d7ec23f3edf7d364
+  data.tar.gz: 6f88e04a9556be655a4a60688e97a6f4f348bef5c00ca45db91ac8c9437d7e64
 SHA512:
-  metadata.gz: '07865cb5068a3cba7956db786f78d0999070b9445798af0df17f9360fa9b3e5b3f19409756f383b9eb402fa8cfa0a2b2bb6ca57475267f915844a248598004b5'
-  data.tar.gz: 0f44b2cd5bd9bad6f85c2980da2ea41ad79c100c46bdce0c4be2d9630cc239b42a0217ae07fd6f568503a42a640da6b63a2840d3b714994fce65708bd8dbf289
+  metadata.gz: 7d37838f47ea574fa8a2ad88db0c61ec6db681bf8081453a46d288480d5e27733a8e19e540841a73c87e3ece96eedef0bf01d4e7520a9b648b627e7da49538ff
+  data.tar.gz: b341891c3b81a5d4b68af360ee1ed8b7d9245685e1a3e50966c7547e3c79e132c6d8c028b733e64920587200ae95e31144d21ac2c23dcf936618a223c5e5d34f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master (unreleased)
 
+## 0.7.1 (2023-02-22)
+
+- Fix Schema Cache to correctly retrieve metadata from renamed tables
+
 ## 0.7.0 (2023-02-14)
 
 - Add support for renaming multiple columns at once in the same table

data/lib/online_migrations/schema_cache.rb

@@ -4,9 +4,9 @@ module OnlineMigrations
   # @private
   module SchemaCache
     def primary_keys(table_name)
-      if renamed_tables.key?(table_name)
-        super(renamed_tables[table_name])
-      elsif renamed_columns.key?(table_name)
+      if (renamed_table = renamed_table?(table_name))
+        super(renamed_table)
+      elsif renamed_column?(table_name)
         super(column_rename_table(table_name))
       else
         super
@@ -14,11 +14,11 @@ module OnlineMigrations
     end
 
     def columns(table_name)
-      if renamed_tables.key?(table_name)
-        super(renamed_tables[table_name])
-      elsif renamed_columns.key?(table_name)
+      if (renamed_table = renamed_table?(table_name))
+        super(renamed_table)
+      elsif renamed_column?(table_name)
         columns = super(column_rename_table(table_name))
-        renamed_columns[table_name].each do |old_column_name, new_column_name|
+        OnlineMigrations.config.column_renames[table_name].each do |old_column_name, new_column_name|
           duplicate_column(old_column_name, new_column_name, columns)
         end
         columns
@@ -31,63 +31,45 @@ module OnlineMigrations
       # Available only in Active Record 6.0+
       return if !defined?(super)
 
-      if renamed_tables.key?(table_name)
-        super(renamed_tables[table_name])
-      elsif renamed_columns.key?(table_name)
+      if (renamed_table = renamed_table?(table_name))
+        super(renamed_table)
+      elsif renamed_column?(table_name)
         super(column_rename_table(table_name))
       else
         super
       end
     end
 
-    def clear!
-      super
-      clear_renames_cache!
-    end
-
     def clear_data_source_cache!(name)
-      if renamed_tables.key?(name)
-        super(renamed_tables[name])
+      if (renamed_table = renamed_table?(name))
+        super(renamed_table)
       end
 
-      if renamed_columns.key?(name)
+      if renamed_column?(name)
         super(column_rename_table(name))
       end
 
       super(name)
-      clear_renames_cache!
     end
 
     private
-      def renamed_tables
-        @renamed_tables ||= begin
-          table_renames = OnlineMigrations.config.table_renames
+      def renamed_table?(table_name)
+        table_renames = OnlineMigrations.config.table_renames
+        if table_renames.key?(table_name)
           views = connection.views
-          table_renames.select do |old_name, _|
-            views.include?(old_name)
-          end
+          table_renames[table_name] if views.include?(table_name)
         end
       end
 
-      def renamed_columns
-        @renamed_columns ||= begin
-          column_renames = OnlineMigrations.config.column_renames
-          views = connection.views
-          column_renames.select do |table_name, _|
-            views.include?(table_name)
-          end
-        end
+      def renamed_column?(table_name)
+        column_renames = OnlineMigrations.config.column_renames
+        column_renames.key?(table_name) && connection.views.include?(table_name)
       end
 
       def column_rename_table(table_name)
         "#{table_name}_column_rename"
       end
 
-      def clear_renames_cache!
-        @renamed_columns = nil
-        @renamed_tables = nil
-      end
-
       def duplicate_column(old_column_name, new_column_name, columns)
         old_column = columns.find { |column| column.name == old_column_name }
         new_column = old_column.dup

data/lib/online_migrations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnlineMigrations
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: online_migrations
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - fatkodima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord