adaptive_alias 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0944e33c0d1dc0b83a734d921c7dadc3f37eaccd2356deebd9775168a98470c
-  data.tar.gz: 3132d4d8a7de8e5325a8505a79f377daf227322f045e2bdc08ec41443d182348
+  metadata.gz: f2c42a4fb70c22a74c09b64fba9c94dc0b1189a94c3e1ca954161ef20e074460
+  data.tar.gz: 51ae34971dff012f5e691bd8fd79252db0706277e38dcdf43766b7eca1b163aa
 SHA512:
-  metadata.gz: 4cf0abcab7059c77833a1eb3e04672bb26fa8f5d86c5d710d2fb603a0ef12fd07cad2e8acc04eb9e8ae2b8b1b39d09dd1c50382143cd4fcb55d6d5ff648ec6be
-  data.tar.gz: ba28c61c515149710cffa4a97b23e4870e4b01f2da7e9114034e728e44cefe02a421c839ca1e8667c054660c274f78b0839bf9fd3eee5062b3ea03ff39554b33
+  metadata.gz: 1f30e10e5a9b035b255eeb129673563b56b10b5ee2fbdac22717fc31dd9a815e77bc1f5a5238c04dfe9cff27414e6db8e72f8bf5c1e360f3905dff29e1cd17d7
+  data.tar.gz: 3b1048bc0d4a42ea9f06a4ecfd215a15ae4687f67d1d52b659a64a096151eb40efe987f7ce3b46273ab89013d0739e7ca925db4ced2f3ca4fe4fcc6a2fb7bb54

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Change Log
 
-### [upcoming](https://github.com/khiav223577/adaptive_alias/compare/v0.2.2...HEAD) 2022/08/15
+### [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)
 

data/lib/adaptive_alias/patches/base.rb

@@ -68,6 +68,21 @@ 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
@@ -84,12 +99,9 @@ module AdaptiveAlias
           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.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
@@ -116,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.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler