adaptive_alias 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ac3bfeadde0c8fed89cc4c1803939cfcb5ebbd8f33bb9ecff1401fa0f33393c
-  data.tar.gz: e716802e6b36217f0bb94f056183887812f7c488a310d6b7b38e206a2d29e471
+  metadata.gz: c77a56c9682de40b3f7c0f8a9da86f3fe2e263b9007ce7fc3f629de1e32a1306
+  data.tar.gz: 4f1e927143e3eaafdaf4930adad533e5aade02a2bc08ba2d893783cc11427b61
 SHA512:
-  metadata.gz: 14726e4300d86f5f5093c6682d8f8be1f864f7fd29cd4f0978567025fb442f04c4276d3f1e61e8ca90f89429dd6c998fec194e92586f362f56da1c1241d166d2
-  data.tar.gz: c0b89da78c766cbaf1208b17f2858d35c1b04b972cf13822fd88b6fa9b3b72ad8b28f628cf4fbcfab28290e0fa95df02c03d71510e5acbf6ba77f89c77557208
+  metadata.gz: 8e4abb047b36b3d433f6b41059ed0d687d39746c87bd272c19ebab3dc99dfc3f4ab21c92a0137cb67b49dd8610d8187226bcb83e4e9ee21dbd0a24356b7559ed
+  data.tar.gz: 45865c03b79c4e1e675c70feed424eabd79313e289fcde60397b36fe83c5ae76cd5eb65ef0ef37ea12110972007708edec31ce2f3d0b2cfd3fdb6507b54e9fd1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Change Log
 
+### [v1.2.1](https://github.com/khiav223577/adaptive_alias/compare/v1.2.0...v1.2.1) 2022/10/13
+- [#31](https://github.com/khiav223577/adaptive_alias/pull/31) [Fix] Deal with `exists?` (@khiav223577)
+- [#30](https://github.com/khiav223577/adaptive_alias/pull/30) [Test] Add test cases to test raw sql query (@khiav223577)
+- [#29](https://github.com/khiav223577/adaptive_alias/pull/29) [Fix] Rescue queries fired by `update_all` (@khiav223577)
+
 ### [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)

data/lib/adaptive_alias/hooks/active_record_persistence.rb

@@ -2,14 +2,14 @@ module AdaptiveAlias
   module Hooks
     module ActiveRecordPersistence
       def _update_record
-        AdaptiveAlias.rescue_statement_invalid(model: self) do
+        AdaptiveAlias.rescue_statement_invalid(model_klass: self.class) do
           attribute_set_fix!
           super
         end
       end
 
       def _create_record(*)
-        AdaptiveAlias.rescue_statement_invalid(model: self) do
+        AdaptiveAlias.rescue_statement_invalid(model_klass: self.class) do
           attribute_set_fix!
           super
         end

data/lib/adaptive_alias/hooks/insert_all.rb

@@ -0,0 +1,34 @@
+require 'active_record'
+
+module AdaptiveAlias
+  module Hooks
+    module InsertAll
+      def initialize(*, **)
+        super
+
+        adjust_keys_by_attribute_aliases
+      end
+
+      def execute
+        AdaptiveAlias.rescue_statement_invalid(model_klass: @model) do
+          adjust_keys_by_attribute_aliases
+          super
+        end
+      end
+
+      private
+
+      def adjust_keys_by_attribute_aliases
+        if @model.attribute_aliases.keys.any?{|s| @keys.include?(s) }
+          @keys = @keys.map{|s| @model.attribute_aliases[s] || s }.to_set
+          @inserts = @inserts.map{|insert| insert.transform_keys{|s| @model.attribute_aliases[s.to_s] || s } }
+          @keys_including_timestamps = nil
+        end
+      end
+    end
+  end
+end
+
+class ActiveRecord::InsertAll
+  prepend AdaptiveAlias::Hooks::InsertAll
+end

data/lib/adaptive_alias/patches/base.rb

@@ -69,7 +69,7 @@ module AdaptiveAlias
           end
         end
 
-        @check_matched = proc do |relation, reflection, model, error|
+        @check_matched = proc do |relation, reflection, model_klass, error|
           next false if not patch.removable
 
           # Error highlight behavior in Ruby 3.1 pollutes the error message
@@ -79,8 +79,8 @@ module AdaptiveAlias
           if ambiguous
             next false if relation and klass.table_name != relation.klass.table_name
             next false if reflection and klass.table_name != reflection.klass.table_name
-            next false if model and klass.table_name != model.class.table_name
-            next false if !relation and !reflection and !model
+            next false if model_klass and klass.table_name != model_klass.table_name
+            next false if !relation and !reflection and !model_klass
           end
 
           next false if not expected_association_err_msgs.include?(error_msg) and not ambiguous

data/lib/adaptive_alias/version.rb

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

data/lib/adaptive_alias.rb

@@ -14,6 +14,7 @@ require 'adaptive_alias/hooks/relation'
 require 'adaptive_alias/hooks/active_record_core'
 require 'adaptive_alias/hooks/active_record_persistence'
 require 'adaptive_alias/hooks/calculations'
+require 'adaptive_alias/hooks/insert_all'
 
 module AdaptiveAlias
   @log_interval = 10 * 60
@@ -42,14 +43,14 @@ module AdaptiveAlias
       end
     end
 
-    def rescue_statement_invalid(relation: nil, reflection: nil, model: nil, &block)
+    def rescue_statement_invalid(relation: nil, reflection: nil, model_klass: nil, &block)
       yield
     rescue ActiveRecord::StatementInvalid => error
-      _key, patch = AdaptiveAlias.current_patches.find{|_key, patch| patch.check_matched.call(relation, reflection, model, error) }
+      _key, patch = AdaptiveAlias.current_patches.find{|_key, patch| patch.check_matched.call(relation, reflection, model_klass, error) }
       raise error if patch == nil
 
       patch.remove_and_fix_association.call(relation, reflection) do
-        return rescue_statement_invalid(relation: relation, reflection: reflection, model: model, &block)
+        return rescue_statement_invalid(relation: relation, reflection: reflection, model_klass: model_klass, &block)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/adaptive_alias/hooks/active_record_persistence.rb
 - lib/adaptive_alias/hooks/association.rb
 - lib/adaptive_alias/hooks/calculations.rb
+- lib/adaptive_alias/hooks/insert_all.rb
 - lib/adaptive_alias/hooks/relation.rb
 - lib/adaptive_alias/patches/backward_patch.rb
 - lib/adaptive_alias/patches/base.rb