adaptive_alias 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a49038a810d4dcbbd42effa1664ff3495966c9a097df8939f92632e5fae54ac
-  data.tar.gz: 3bee0518e9915af89ac616be205a73da6155e09d9f3d28947cd3cf9145e18660
+  metadata.gz: 6ac3bfeadde0c8fed89cc4c1803939cfcb5ebbd8f33bb9ecff1401fa0f33393c
+  data.tar.gz: e716802e6b36217f0bb94f056183887812f7c488a310d6b7b38e206a2d29e471
 SHA512:
-  metadata.gz: '094892c502fe7343c74a5dae66ab57b1bd21405a73cf38c390c41b12bfd8d01f39c5d9cec78920ca1a388e93be68e280c95041a3fae4d43f9a7ea9ed931f6d22'
-  data.tar.gz: 1c7e437b160e7ae6cbb8bb8624f654a220ed35fdbedae3a5a45a306f616bab4f7e62153c08cc874e59a806a7fd5bdc269a86c231180b597b333e9e2556e13acd
+  metadata.gz: 14726e4300d86f5f5093c6682d8f8be1f864f7fd29cd4f0978567025fb442f04c4276d3f1e61e8ca90f89429dd6c998fec194e92586f362f56da1c1241d166d2
+  data.tar.gz: c0b89da78c766cbaf1208b17f2858d35c1b04b972cf13822fd88b6fa9b3b72ad8b28f628cf4fbcfab28290e0fa95df02c03d71510e5acbf6ba77f89c77557208

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Change Log
 
+### [v1.2.0](https://github.com/khiav223577/adaptive_alias/compare/v1.1.2...v1.2.0) 2022/10/12
+- [#28](https://github.com/khiav223577/adaptive_alias/pull/28) [Fix] Deal with OR-query (@khiav223577)
+- [#27](https://github.com/khiav223577/adaptive_alias/pull/27) [Enhance] make sure `mark_removable` will be called when manually remove patch (@khiav223577)
+- [#26](https://github.com/khiav223577/adaptive_alias/pull/26) [Fix] Deal with old attribute sets come from cache (identity_cache) (@khiav223577)
+
+### [v1.1.2](https://github.com/khiav223577/adaptive_alias/compare/v1.1.1...v1.1.2) 2022/10/11
+- [#25](https://github.com/khiav223577/adaptive_alias/pull/25) [Fix] Deal with count, sum, and group (@khiav223577)
+
 ### [v1.1.1](https://github.com/khiav223577/adaptive_alias/compare/v1.1.0...v1.1.1) 2022/10/07
 - [#24](https://github.com/khiav223577/adaptive_alias/pull/24) [Fix] Disappeared value when instantiating all and then create / update multiple models one by one (@khiav223577)
 - [#23](https://github.com/khiav223577/adaptive_alias/pull/23) [Enhance] No need to determine missing value manually (@khiav223577)

data/README.md

@@ -25,10 +25,12 @@ We need a way to automatically adjust the patch to adapt current schema.
                           
 ```
 
-This is what this gem wants to achieve. We don't want to do complex migrations, take care of backward-compatibiliy, and have any downtime.
+This is what this gem wants to achieve. We don't want to do complex migrations, take care of backward-compatibility, and have any downtime.
 Just rely on this gem.
 
 
+Note that it is not thread-safe when swapping patches, please make sure there is no multi-thread during migration.
+
 ## Supports
 - Ruby 2.6 ~ 2.7, 3.0 ~ 3.1
 - Rails 6.0, 6.1, 7.0

data/gemfiles/6.0.gemfile

@@ -6,6 +6,7 @@ group :test do
   gem 'simplecov', '< 0.18'
   gem 'mysql2', '0.5.3'
   gem 'acts-as-taggable-on', '~> 7.0.0'
+  gem 'identity_cache', '~> 1.2.0'
 end
 
 gemspec path: '../'

data/gemfiles/6.1.gemfile

@@ -6,6 +6,7 @@ group :test do
   gem 'simplecov', '< 0.18'
   gem 'mysql2', '0.5.3'
   gem 'acts-as-taggable-on', '~> 7.0.0'
+  gem 'identity_cache', '~> 1.2.0'
 end
 
 gemspec path: '../'

data/gemfiles/7.0.gemfile

@@ -7,6 +7,7 @@ group :test do
   gem 'simplecov', '< 0.18'
   gem 'mysql2', '0.5.3'
   gem 'acts-as-taggable-on', '~> 9.0.0'
+  gem 'identity_cache', '~> 1.2.0'
 end
 
 gemspec path: '../'

data/lib/adaptive_alias/active_model_patches/read_attribute.rb

@@ -18,6 +18,7 @@ module AdaptiveAlias
         name = self.class.attribute_aliases[name] || name
 
         sync_with_transaction_state if @transaction_state&.finalized?
+        attribute_set_fix!
         return @attributes.fetch_value(name, &block)
       end
     end

data/lib/adaptive_alias/hooks/relation.rb

@@ -5,6 +5,14 @@ module AdaptiveAlias
         AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
 
+      def update_all(*)
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
+      end
+
+      def exists?(*)
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
+      end
+
       def select_all(*)
         AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end

data/lib/adaptive_alias/patches/backward_patch.rb

@@ -11,7 +11,7 @@ module AdaptiveAlias
         add_hooks!(current_column: @new_column, alias_column: @old_column, log_warning: true)
       end
 
-      def remove!
+      def do_remove!
         super
         @klass.remove_alias_attribute(@old_column)
         @klass.define_attribute_method(@old_column)

data/lib/adaptive_alias/patches/base.rb

@@ -3,8 +3,8 @@
 module AdaptiveAlias
   module Patches
     class Base
-      attr_reader :fix_association
-      attr_reader :fix_missing_attribute
+      attr_reader :check_matched
+      attr_reader :remove_and_fix_association
       attr_reader :removed
       attr_reader :removable
 
@@ -23,24 +23,24 @@ module AdaptiveAlias
         AdaptiveAlias.get_or_create_model_module(klass).instance_exec do
           remove_method(new_column) if method_defined?(new_column)
           define_method(new_column) do
-            AdaptiveAlias.rescue_missing_attribute(klass){ self[new_column] }
+            self[new_column]
           end
 
           remove_method("#{new_column}=") if method_defined?("#{new_column}=")
           define_method("#{new_column}=") do |*args|
-            AdaptiveAlias.rescue_missing_attribute(klass){ super(*args) }
+            super(*args)
           end
 
           remove_method(old_column) if method_defined?(old_column)
           define_method(old_column) do
             patch.log_warning if log_warning
-            AdaptiveAlias.rescue_missing_attribute(klass){ self[old_column] }
+            self[old_column]
           end
 
           remove_method("#{old_column}=") if method_defined?("#{old_column}=")
           define_method("#{old_column}=") do |*args|
             patch.log_warning if log_warning
-            AdaptiveAlias.rescue_missing_attribute(klass){ super(*args) }
+            super(*args)
           end
         end
 
@@ -54,24 +54,6 @@ module AdaptiveAlias
           "Mysql2::Error: Unknown column '#{current_column}' in 'field list'".freeze,
         ].freeze
 
-        expected_attribute_err_msgs = [
-          "can't write unknown attribute `#{current_column}`".freeze,
-          "missing attribute: #{current_column}".freeze,
-        ].freeze
-
-        @fix_missing_attribute = proc do |error_klass, error|
-          next false if not patch.removable
-          next false if patch.removed
-          next false if klass.table_name != error_klass.table_name
-
-          # Error highlight behavior in Ruby 3.1 pollutes the error message
-          error_msg = error.respond_to?(:original_message) ? error.original_message : error.message
-          next false if not expected_attribute_err_msgs.include?(error_msg)
-
-          patch.remove!
-          next true
-        end
-
         fix_arel_attributes = proc do |attr|
           next if not attr.is_a?(Arel::Attributes::Attribute)
           next if attr.name != current_column.to_s
@@ -87,9 +69,8 @@ module AdaptiveAlias
           end
         end
 
-        @fix_association = proc do |relation, reflection, model, error|
+        @check_matched = proc do |relation, reflection, model, error|
           next false if not patch.removable
-          next false if patch.removed
 
           # Error highlight behavior in Ruby 3.1 pollutes the error message
           error_msg = error.respond_to?(:original_message) ? error.original_message : error.message
@@ -103,25 +84,28 @@ module AdaptiveAlias
           end
 
           next false if not expected_association_err_msgs.include?(error_msg) and not ambiguous
+          next true
+        end
 
-          patch.remove!
+        @remove_and_fix_association = proc do |relation, reflection, &block|
+          patch.remove! do
+            if relation
+              relation.reset # reset @arel
 
-          if relation
-            relation.reset # reset @arel
+              joins = relation.arel.source.right # @ctx.source.right << create_join(relation, nil, klass)
 
-            joins = relation.arel.source.right # @ctx.source.right << create_join(relation, nil, klass)
+              # adjust select fields
+              index = relation.select_values.index(current_column)
+              relation.select_values[index] = alias_column if index
 
-            # adjust select fields
-            index = relation.select_values.index(current_column)
-            relation.select_values[index] = alias_column if index
+              fix_arel_nodes.call(joins.map{|s| s.right.expr })
+              fix_arel_nodes.call(relation.where_clause.send(:predicates))
+            end
 
-            fix_arel_nodes.call(joins.map{|s| s.right.expr })
-            fix_arel_nodes.call(relation.where_clause.send(:predicates))
-          end
+            reflection.clear_association_scope_cache if reflection
 
-          reflection.clear_association_scope_cache if reflection
-
-          next true
+            block.call
+          end
         end
       end
 
@@ -133,15 +117,24 @@ module AdaptiveAlias
       end
 
       def remove!
-        @removed = true
+        if not @removed
+          @removed = true
+          new_patch = do_remove!
+        end
+
+        yield if block_given?
+      ensure
+        new_patch.mark_removable if new_patch
+      end
 
+      def do_remove!
         reset_caches(@klass)
         ActiveRecord::Base.descendants.each do |model_klass|
           reset_caches(model_klass) if model_klass.table_name == @klass.table_name
         end
 
-        @fix_association = nil
-        @fix_missing_attribute = nil
+        @check_matched = nil
+        @remove_and_fix_association = nil
       end
 
       def mark_removable
@@ -162,10 +155,14 @@ module AdaptiveAlias
       def each_nodes(nodes, &block)
         nodes.each do |node|
           case node
+          when Arel::Nodes::Grouping
+            each_nodes([node.expr], &block)
           when Arel::Nodes::Equality
             yield(node)
           when Arel::Nodes::And
             each_nodes(node.children, &block)
+          when Arel::Nodes::Or
+            each_nodes([node.left, node.right], &block)
           end
         end
       end

data/lib/adaptive_alias/patches/forward_patch.rb

@@ -11,7 +11,7 @@ module AdaptiveAlias
         add_hooks!(current_column: @old_column, alias_column: @new_column)
       end
 
-      def remove!
+      def do_remove!
         super
         @klass.remove_alias_attribute(@new_column)
         @klass.define_attribute_method(@new_column)

data/lib/adaptive_alias/version.rb

@@ -1,3 +1,3 @@
 module AdaptiveAlias
-  VERSION = '1.1.2'
+  VERSION = '1.2.1'
 end

data/lib/adaptive_alias.rb

@@ -10,8 +10,6 @@ require 'adaptive_alias/patches/backward_patch'
 require 'adaptive_alias/patches/forward_patch'
 
 require 'adaptive_alias/hooks/association'
-require 'adaptive_alias/hooks/association_scope'
-require 'adaptive_alias/hooks/singular_association'
 require 'adaptive_alias/hooks/relation'
 require 'adaptive_alias/hooks/active_record_core'
 require 'adaptive_alias/hooks/active_record_persistence'
@@ -47,21 +45,12 @@ module AdaptiveAlias
     def rescue_statement_invalid(relation: nil, reflection: nil, model: nil, &block)
       yield
     rescue ActiveRecord::StatementInvalid => error
-      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_association.call(relation, reflection, model, error) }
+      _key, patch = AdaptiveAlias.current_patches.find{|_key, patch| patch.check_matched.call(relation, reflection, model, error) }
+      raise error if patch == nil
 
-      result = rescue_statement_invalid(relation: relation, reflection: reflection, model: model, &block)
-      AdaptiveAlias.current_patches.each_value(&:mark_removable)
-      return result
-    end
-
-    def rescue_missing_attribute(klass, &block)
-      yield
-    rescue ActiveModel::MissingAttributeError => error
-      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_missing_attribute.call(klass, error) }
-
-      result = rescue_missing_attribute(klass, &block)
-      AdaptiveAlias.current_patches.each_value(&:mark_removable)
-      return result
+      patch.remove_and_fix_association.call(relation, reflection) do
+        return rescue_statement_invalid(relation: relation, reflection: reflection, model: model, &block)
+      end
     end
 
     def get_or_create_model_module(klass)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,10 +131,8 @@ files:
 - lib/adaptive_alias/hooks/active_record_core.rb
 - lib/adaptive_alias/hooks/active_record_persistence.rb
 - lib/adaptive_alias/hooks/association.rb
-- lib/adaptive_alias/hooks/association_scope.rb
 - lib/adaptive_alias/hooks/calculations.rb
 - lib/adaptive_alias/hooks/relation.rb
-- lib/adaptive_alias/hooks/singular_association.rb
 - lib/adaptive_alias/patches/backward_patch.rb
 - lib/adaptive_alias/patches/base.rb
 - lib/adaptive_alias/patches/forward_patch.rb

data/lib/adaptive_alias/hooks/association_scope.rb

@@ -1,13 +0,0 @@
-module AdaptiveAlias
-  module Hooks
-    module AssociationScope
-      def last_chain_scope(_scope, reflection, owner)
-        AdaptiveAlias.rescue_missing_attribute(owner.class){ super }
-      end
-    end
-  end
-end
-
-class ActiveRecord::Associations::AssociationScope
-  prepend AdaptiveAlias::Hooks::AssociationScope
-end

data/lib/adaptive_alias/hooks/singular_association.rb

@@ -1,13 +0,0 @@
-module AdaptiveAlias
-  module Hooks
-    module SingularAssociation
-      def reader(*)
-        AdaptiveAlias.rescue_missing_attribute(owner.class){ super }
-      end
-    end
-  end
-end
-
-class ActiveRecord::Associations::SingularAssociation
-  prepend AdaptiveAlias::Hooks::SingularAssociation
-end