adaptive_alias 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0375ca9867e41c41fe18b38cb1f37ff2a0067367304f6481250cd573c5dc5be4
-  data.tar.gz: bc0ebb4c4d63ea36e203b94f5c3ea0411c4fab408e93ea6c9dc0de5354c2db8c
+  metadata.gz: f2c42a4fb70c22a74c09b64fba9c94dc0b1189a94c3e1ca954161ef20e074460
+  data.tar.gz: 51ae34971dff012f5e691bd8fd79252db0706277e38dcdf43766b7eca1b163aa
 SHA512:
-  metadata.gz: f0d5f519ab910bcf93c982f2ea6ca9c3e944ea0e90a07d6e938668b4575d450d6d019a60b62dd2020c373434e8ece4f7c1d9ea148ca269a4823718b80f8a8c07
-  data.tar.gz: 9a699915af111f6e01aa6fac45a888583a629b1f6eb0d75c84a15188f329e3f34401a330a6ee33040453b4e9f2d6a018bca61626e0784944004832c3db6d6bc3
+  metadata.gz: 1f30e10e5a9b035b255eeb129673563b56b10b5ee2fbdac22717fc31dd9a815e77bc1f5a5238c04dfe9cff27414e6db8e72f8bf5c1e360f3905dff29e1cd17d7
+  data.tar.gz: 3b1048bc0d4a42ea9f06a4ecfd215a15ae4687f67d1d52b659a64a096151eb40efe987f7ce3b46273ab89013d0739e7ca925db4ced2f3ca4fe4fcc6a2fb7bb54

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Change Log
 
+### [v0.2.3](https://github.com/khiav223577/adaptive_alias/compare/v0.2.2...v0.2.3) 2022/08/17
+- [#17](https://github.com/khiav223577/adaptive_alias/pull/17) [Feature] Support joins (@khiav223577)
+- [#16](https://github.com/khiav223577/adaptive_alias/pull/16) [Enhance] No need to clone node (@khiav223577)
+- [#15](https://github.com/khiav223577/adaptive_alias/pull/15) [Test] Add test cases to test calling pluck on same model (@khiav223577)
+
+### [v0.2.2](https://github.com/khiav223577/adaptive_alias/compare/v0.2.1...v0.2.2) 2022/08/11
+- [#14](https://github.com/khiav223577/adaptive_alias/pull/14) [Fix] Fail to use backward-patch when target column has already been migrated (@khiav223577)
+
+### [v0.2.1](https://github.com/khiav223577/adaptive_alias/compare/v0.2.0...v0.2.1) 2022/08/11
+- [#13](https://github.com/khiav223577/adaptive_alias/pull/13) [Fix] Nested module include is not supported until ruby 3.0 (@khiav223577)
+- [#12](https://github.com/khiav223577/adaptive_alias/pull/12) [Test] Add test cases to test column_names (@khiav223577)
+
 ### [v0.2.0](https://github.com/khiav223577/adaptive_alias/compare/v0.1.0...v0.2.0) 2022/08/05
 - [#11](https://github.com/khiav223577/adaptive_alias/pull/11) [Feature] Support polymorphic (@khiav223577)
 - [#10](https://github.com/khiav223577/adaptive_alias/pull/10) [Enhance] Prevent adding methods directly in class / module (@khiav223577)

data/lib/adaptive_alias/active_model_patches/apply_scope.rb

@@ -4,7 +4,7 @@ module AdaptiveAlias
   module ActiveModelPatches
     module ApplyScope
       def apply_scope(scope, table, key, value)
-        klass = table.instance_variable_get(:@klass) || table.send(:type_caster).send(:types)
+        klass = table.instance_variable_get(:@klass) || table.klass
         key = klass.attribute_aliases[key] || key
         super(scope, table, key, value)
       end

data/lib/adaptive_alias/active_model_patches/arel_table.rb

@@ -0,0 +1,26 @@
+require 'active_record'
+
+module AdaptiveAlias
+  module ActiveModelPatches
+    module ArelTable
+      def [](name)
+        name = name.to_s if name.is_a?(Symbol)
+        klass = self.klass
+        name = klass.attribute_aliases[name] || name if klass
+        super
+      end
+
+      def klass
+        return @type_caster.instance_variable_get(:@klass) if @type_caster.is_a?(ActiveRecord::TypeCaster::Connection)
+        return @type_caster.send(:types) if @type_caster.is_a?(ActiveRecord::TypeCaster::Map)
+      end
+    end
+  end
+end
+
+# https://github.com/rails/rails/commit/1ac40f16c5bc5246a4aaeab0558eb1c3078b3c6e
+if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
+  class Arel::Table
+    prepend AdaptiveAlias::ActiveModelPatches::ArelTable
+  end
+end

data/lib/adaptive_alias/patches/base.rb

@@ -46,6 +46,10 @@ module AdaptiveAlias
 
         expected_association_err_msgs = [
           "Mysql2::Error: Unknown column '#{klass.table_name}.#{current_column}' in 'where clause'".freeze,
+          "Mysql2::Error: Unknown column '#{klass.table_name}.#{current_column}' in 'on clause'".freeze,
+        ].freeze
+
+        expected_ambiguous_association_err_msgs = [
           "Mysql2::Error: Unknown column '#{current_column}' in 'field list'".freeze,
         ].freeze
 
@@ -64,21 +68,40 @@ module AdaptiveAlias
           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
+          next if klass.table_name != attr.relation.name
+
+          attr.name = alias_column.to_s
+        end
+
+        fix_arel_nodes = proc do |nodes|
+          each_nodes(nodes) do |node|
+            fix_arel_attributes.call(node.left)
+            fix_arel_attributes.call(node.right)
+          end
+        end
+
         @fix_association = proc do |relation, reflection, error|
           next false if not patch.removable
           next false if patch.removed
-          next false if not expected_association_err_msgs.include?(error.message)
+
+          ambiguous = expected_ambiguous_association_err_msgs.include?(error.message)
+
+          if ambiguous
+            next false if relation and klass != relation.klass
+            next false if reflection and klass != reflection.klass
+          end
+
+          next false if not expected_association_err_msgs.include?(error.message) and not ambiguous
 
           patch.remove!
 
           if relation
-            relation.where_clause.send(:predicates).each do |node|
-              next if node.left.name != current_column.to_s
-              next if klass.table_name != node.left.relation.name
-
-              node.left = node.left.clone
-              node.left.name = alias_column.to_s
-            end
+            joins = relation.arel.source.right # @ctx.source.right << create_join(relation, nil, klass)
+            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
@@ -105,6 +128,19 @@ module AdaptiveAlias
       def mark_removable
         @removable = true
       end
+
+      private
+
+      def each_nodes(nodes, &block)
+        nodes.each do |node|
+          case node
+          when Arel::Nodes::Equality
+            yield(node)
+          when Arel::Nodes::And
+            each_nodes(node.children, &block)
+          end
+        end
+      end
     end
   end
 end

data/lib/adaptive_alias/version.rb

@@ -1,3 +1,3 @@
 module AdaptiveAlias
-  VERSION = '0.2.1'
+  VERSION = '0.2.4'
 end

data/lib/adaptive_alias.rb

@@ -5,6 +5,7 @@ require 'adaptive_alias/active_model_patches/read_attribute'
 require 'adaptive_alias/active_model_patches/write_attribute'
 require 'adaptive_alias/active_model_patches/remove_alias_attribute'
 require 'adaptive_alias/active_model_patches/apply_scope'
+require 'adaptive_alias/active_model_patches/arel_table'
 require 'adaptive_alias/patches/backward_patch'
 require 'adaptive_alias/patches/forward_patch'
 
@@ -33,7 +34,7 @@ module AdaptiveAlias
         extend ActiveSupport::Concern
 
         included do
-          patch = (column_names.include?(new_column) ? Patches::BackwardPatch : Patches::ForwardPatch).new(self, old_column, new_column)
+          patch = (column_names.include?(new_column.to_s) ? Patches::BackwardPatch : Patches::ForwardPatch).new(self, old_column, new_column)
           patch.apply!
           patch.mark_removable
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - gemfiles/7.0.gemfile
 - lib/adaptive_alias.rb
 - lib/adaptive_alias/active_model_patches/apply_scope.rb
+- lib/adaptive_alias/active_model_patches/arel_table.rb
 - lib/adaptive_alias/active_model_patches/read_attribute.rb
 - lib/adaptive_alias/active_model_patches/remove_alias_attribute.rb
 - lib/adaptive_alias/active_model_patches/write_attribute.rb