adaptive_alias 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0944e33c0d1dc0b83a734d921c7dadc3f37eaccd2356deebd9775168a98470c
-  data.tar.gz: 3132d4d8a7de8e5325a8505a79f377daf227322f045e2bdc08ec41443d182348
+  metadata.gz: f5938ea6d66ddde37c2f28e252297844a422d3431b37105c54b2246244880971
+  data.tar.gz: ad5e44e57886b67db5eaacc898a910b5b916d194e8eca3ad821851f9b9c4a35e
 SHA512:
-  metadata.gz: 4cf0abcab7059c77833a1eb3e04672bb26fa8f5d86c5d710d2fb603a0ef12fd07cad2e8acc04eb9e8ae2b8b1b39d09dd1c50382143cd4fcb55d6d5ff648ec6be
-  data.tar.gz: ba28c61c515149710cffa4a97b23e4870e4b01f2da7e9114034e728e44cefe02a421c839ca1e8667c054660c274f78b0839bf9fd3eee5062b3ea03ff39554b33
+  metadata.gz: 2ed9da0a54fea620f1d31ebb8c6c15b11591eb5b34d96e21f699dd1c3c0acb64a9415ca224388688b8f6af1871f775b197a4876bf54e4abd24a59ec6ec154922
+  data.tar.gz: bcc8815527922cfb226c7ea8c718f25ed9d2f8cd029b0666ec567c9a2fb2ce3414596cbfc39e146d817be7ee8b2f36dfa6a304267ad60cb903ac3dc54706321e

data/.rubocop.yml

@@ -222,9 +222,9 @@ Metrics/CyclomaticComplexity:
   Enabled: true
 
 Layout/LineLength:
-  Description: 'Limit lines to 160 characters.'
+  Description: 'Limit lines to 180 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
-  Max: 160
+  Max: 180
   Enabled: true
   Exclude:
     - 'config/locales/**'

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## Change Log
 
-### [upcoming](https://github.com/khiav223577/adaptive_alias/compare/v0.2.2...HEAD) 2022/08/15
+### [v0.2.4](https://github.com/khiav223577/adaptive_alias/compare/v0.2.3...v0.2.4) 2022/08/18
+- [#18](https://github.com/khiav223577/adaptive_alias/pull/18) [Fix] get model from a relation with join will not generate right query (after migration) (@khiav223577)
+
+### [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/active_model_patches/write_attribute.rb

@@ -20,6 +20,7 @@ module AdaptiveAlias
   end
 end
 
+# Nested module include is not supported until ruby 3.0
 class ActiveRecord::Base
   prepend AdaptiveAlias::ActiveModelPatches::WriteAttribute
 end

data/lib/adaptive_alias/hooks/active_record_core.rb

@@ -0,0 +1,18 @@
+module AdaptiveAlias
+  module Hooks
+    module ActiveRecordCore
+      def find(*)
+        AdaptiveAlias.rescue_statement_invalid(nil, nil){ super }
+      end
+
+      def find_by(*)
+        AdaptiveAlias.rescue_statement_invalid(nil, nil){ super }
+      end
+    end
+  end
+end
+
+# Nested module include is not supported until ruby 3.0
+class << ActiveRecord::Base
+  prepend AdaptiveAlias::Hooks::ActiveRecordCore
+end

data/lib/adaptive_alias/patches/base.rb

@@ -47,6 +47,7 @@ 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,
+          "Mysql2::Error: Unknown column '#{klass.table_name}.#{current_column}' in 'field list'".freeze,
         ].freeze
 
         expected_ambiguous_association_err_msgs = [
@@ -61,13 +62,28 @@ module AdaptiveAlias
         @fix_missing_attribute = proc do |error_klass, error|
           next false if not patch.removable
           next false if patch.removed
-          next false if klass != error_klass
+          next false if klass.table_name != error_klass.table_name
           next false if not expected_attribute_err_msgs.include?(error.message)
 
           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
+          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
@@ -75,8 +91,8 @@ module AdaptiveAlias
           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
+            next false if relation and klass.table_name != relation.klass.table_name
+            next false if reflection and klass.table_name != reflection.klass.table_name
           end
 
           next false if not expected_association_err_msgs.include?(error.message) and not ambiguous
@@ -84,12 +100,16 @@ 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
+            relation.reset # reset @arel
+
+            joins = relation.arel.source.right # @ctx.source.right << create_join(relation, nil, klass)
 
-              node.left.name = alias_column.to_s
-            end
+            # 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
 
           reflection.clear_association_scope_cache if reflection
@@ -107,8 +127,12 @@ module AdaptiveAlias
 
       def remove!
         @removed = true
-        @klass.reset_column_information
-        @klass.columns_hash
+
+        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
       end
@@ -116,6 +140,28 @@ module AdaptiveAlias
       def mark_removable
         @removable = true
       end
+
+      private
+
+      def reset_caches(klass)
+        # We need to call reload_schema_from_cache (which is called in reset_column_information),
+        # in order to reset klass.attributes_builder which are initialized with outdated defaults.
+        # If not, it will not raise missing attributes error when we try to access the column which has already been renamed,
+        # and we will have no way to know the column has been renamed since no error is raised for us to rescue.
+        klass.reset_column_information
+        klass.columns_hash
+      end
+
+      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 = '1.0.0'
 end

data/lib/adaptive_alias.rb

@@ -13,6 +13,7 @@ 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'
 
 module AdaptiveAlias
   @log_interval = 10 * 60

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - 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
+- lib/adaptive_alias/hooks/active_record_core.rb
 - lib/adaptive_alias/hooks/association.rb
 - lib/adaptive_alias/hooks/association_scope.rb
 - lib/adaptive_alias/hooks/relation.rb