adaptive_alias 0.2.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c42a4fb70c22a74c09b64fba9c94dc0b1189a94c3e1ca954161ef20e074460
-  data.tar.gz: 51ae34971dff012f5e691bd8fd79252db0706277e38dcdf43766b7eca1b163aa
+  metadata.gz: 2fe3d8361642cc73cba568a7a131efa94f9e17eeada3f1af45990ff876abcb6d
+  data.tar.gz: befec070dac8af388634e02f5479a78d61ca4e7ddd10e7a489aeae2e2e7180e8
 SHA512:
-  metadata.gz: 1f30e10e5a9b035b255eeb129673563b56b10b5ee2fbdac22717fc31dd9a815e77bc1f5a5238c04dfe9cff27414e6db8e72f8bf5c1e360f3905dff29e1cd17d7
-  data.tar.gz: 3b1048bc0d4a42ea9f06a4ecfd215a15ae4687f67d1d52b659a64a096151eb40efe987f7ce3b46273ab89013d0739e7ca925db4ced2f3ca4fe4fcc6a2fb7bb54
+  metadata.gz: 2c676366d3132428d290da9291e886f06620d07836a56b87bb59d82f4dc84b86e8ba73f317a26b126d01bb4011a86c04d5653476c277b49d2f81d3728be5e973
+  data.tar.gz: d26cc5ad6eb77b9cba338788eafcb9f3826b7dbe4cc4afbf1dfd8e22f32bf626be7294bfd87f007e60db429f7294127f994eb4d402c9699cde83017b0b38b540

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,5 +1,13 @@
 ## Change Log
 
+### [v1.0.0](https://github.com/khiav223577/adaptive_alias/compare/v0.2.4...v1.0.0) 2022/09/22
+- [#21](https://github.com/khiav223577/adaptive_alias/pull/21) [Fix] Model with ignored_columns or calling find_by directly on model class with aliased column argument will fail (@khiav223577)
+- [#20](https://github.com/khiav223577/adaptive_alias/pull/20) [Fix] Problems with STI classes and models that uses same table name (@khiav223577)
+- [#19](https://github.com/khiav223577/adaptive_alias/pull/19) [Fix] Rescue the error when doing direct access to target table's field (@khiav223577)
+
+### [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)

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{ super }
+      end
+
+      def find_by(*)
+        AdaptiveAlias.rescue_statement_invalid{ 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/hooks/active_record_persistence.rb

@@ -0,0 +1,14 @@
+module AdaptiveAlias
+  module Hooks
+    module ActiveRecordPersistence
+      def _create_record(*)
+        AdaptiveAlias.rescue_statement_invalid(model: self){ super }
+      end
+    end
+  end
+end
+
+# Nested module include is not supported until ruby 3.0
+class ActiveRecord::Base
+  prepend AdaptiveAlias::Hooks::ActiveRecordPersistence
+end

data/lib/adaptive_alias/hooks/association.rb

@@ -2,11 +2,7 @@ module AdaptiveAlias
   module Hooks
     module Association
       def find_target(*)
-        AdaptiveAlias.rescue_statement_invalid(nil, reflection){ super }
-      end
-
-      def create!(attributes = {}, &block)
-        AdaptiveAlias.rescue_statement_invalid(association_scope, reflection){ super }
+        AdaptiveAlias.rescue_statement_invalid(reflection: reflection){ super }
       end
     end
   end

data/lib/adaptive_alias/hooks/relation.rb

@@ -2,15 +2,15 @@ module AdaptiveAlias
   module Hooks
     module Relation
       def pluck(*)
-        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
 
       def select_all(*)
-        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
 
       def exec_queries(*)
-        AdaptiveAlias.rescue_statement_invalid(self, nil){ super }
+        AdaptiveAlias.rescue_statement_invalid(relation: self){ super }
       end
     end
   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,7 +62,7 @@ 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!
@@ -83,23 +84,39 @@ module AdaptiveAlias
           end
         end
 
-        @fix_association = proc do |relation, reflection, error|
+        @fix_association = proc do |relation, reflection, model, error|
           next false if not patch.removable
           next false if patch.removed
 
           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
+            next false if model and klass.table_name != model.class.table_name
+            next false if !relation and !reflection and !model
           end
 
           next false if not expected_association_err_msgs.include?(error.message) and not ambiguous
 
           patch.remove!
 
+          if model
+            attributes = model.instance_variable_get(:@attributes).instance_variable_get(:@attributes)
+            attributes.transform_keys! do |key|
+              key == current_column.to_s ? alias_column.to_s : key
+            end
+          end
+
           if relation
+            relation.reset # reset @arel
+
             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
+
             fix_arel_nodes.call(joins.map{|s| s.right.expr })
             fix_arel_nodes.call(relation.where_clause.send(:predicates))
           end
@@ -119,8 +136,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
@@ -131,6 +152,15 @@ module AdaptiveAlias
 
       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

data/lib/adaptive_alias/version.rb

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

data/lib/adaptive_alias.rb

@@ -13,6 +13,8 @@ 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'
 
 module AdaptiveAlias
   @log_interval = 10 * 60
@@ -41,12 +43,12 @@ module AdaptiveAlias
       end
     end
 
-    def rescue_statement_invalid(relation, reflection, &block)
+    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, error) }
+      raise error if AdaptiveAlias.current_patches.all?{|_key, patch| !patch.fix_association.call(relation, reflection, model, error) }
 
-      result = rescue_statement_invalid(relation, reflection, &block)
+      result = rescue_statement_invalid(relation: relation, reflection: reflection, model: model, &block)
       AdaptiveAlias.current_patches.each_value(&:mark_removable)
       return result
     end

metadata

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