adaptive_alias 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53def64d14130ef1552a0a427246706ce42fb8696dfba356c323adcef3c39f97
-  data.tar.gz: 7c6b4ed35d6a0c90d06b09368b1f0c1617abfffac05f153015f3a4a8878ec6a5
+  metadata.gz: b0944e33c0d1dc0b83a734d921c7dadc3f37eaccd2356deebd9775168a98470c
+  data.tar.gz: 3132d4d8a7de8e5325a8505a79f377daf227322f045e2bdc08ec41443d182348
 SHA512:
-  metadata.gz: 9c8b4ec7ad1588f922bf0af037061216699a056c023ea70975796c66dafd57cf254c5d4915a98cfa7e1b9836b53f61ca2961ea0b9aa399e2fe7dc55510192d23
-  data.tar.gz: c6a532d2f341729637a7ca9630fe1338ddeb5b553cc0ea897e6cb784d18adbd47db21254df82746a06e915c57a2f2567227436a9562eac21cb150174be16d5e7
+  metadata.gz: 4cf0abcab7059c77833a1eb3e04672bb26fa8f5d86c5d710d2fb603a0ef12fd07cad2e8acc04eb9e8ae2b8b1b39d09dd1c50382143cd4fcb55d6d5ff648ec6be
+  data.tar.gz: ba28c61c515149710cffa4a97b23e4870e4b01f2da7e9114034e728e44cefe02a421c839ca1e8667c054660c274f78b0839bf9fd3eee5062b3ea03ff39554b33

data/CHANGELOG.md

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

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,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,
         ].freeze
 
         expected_ambiguous_association_err_msgs = [
@@ -87,7 +88,6 @@ module AdaptiveAlias
               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
           end

data/lib/adaptive_alias/version.rb

@@ -1,3 +1,3 @@
 module AdaptiveAlias
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 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'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adaptive_alias
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-17 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