ar_cache 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1771642ffaabd7ea8a7fc41c1ffc3cef4be12bbeaaca3ef40aa40c2f01ea291a
-  data.tar.gz: 4b3513827e1f33d3823e0345de4e266b0312e014d1d50fbdedf52eafaa97a02c
+  metadata.gz: 56df5f788fb94d493c94dca6942c80819ae1fa1c567b9b6228020ad935c35c4f
+  data.tar.gz: 2b253f18c8174b39159f6bb0c79f298c0064a35c05ac4334719e6ca50db13a26
 SHA512:
-  metadata.gz: c80c2bdc655f64409c1f9263415ed8fbd70aa71cb851275a7c31d8f9a459d51d46ee2fb0707c14839a37418c076e4251c55226adf7bf9aaef233d1b89faef7d0
-  data.tar.gz: 2ad58b8a624d9e3fe559be94076b1593b54fc2f52d5f88a111d31d2c5223d4fdba6ddb9f562270fe92af99199c1aeda624e3cbfb8c97701b2b3e17f2559c184a
+  metadata.gz: 536189cb015607a2fd12c85f03f995ae7443b5a019e72b37526cb371a994182bad76a010c0b2f05e06be1041fee7e5bb7177ebe946155a5de73df827a66521d6
+  data.tar.gz: f65ea53cc987f2b3aed000408fd8b70da94dfc56a27f04db5e0aed33dac41ad7838aec761640cbff037fa7d733c5b538428154f6e082533051a20a8bf5740b52

data/CHANGELOG.md

@@ -2,10 +2,16 @@
 
 ## main
 
+## 1.4.0 (2021-03-15 UTC)
+
+[Commit [#7cc9ec8](https://github.com/OuYangJinTing/ar_cache/commit/7cc9ec8047394bb7758e25edd3b42fa48bb88640)]:
+
+- Remove `ArCache::Table` `ignored_columns` configuration.
+- Fix `ActiveRecord` call `#select` write to cache data is incomplete.
+
 ## 1.3.0 (2021-03-13 UTC)
 
-- [Commit [#4ec14e9](https://github.com/OuYangJinTing/ar_cache/commit/4ec14e9e762abb57a8ff18aa8c93a514db49c552)]: 
-Optimize association cache, only cacheable association use ArCache query now.
+- [Commit [#4ec14e9](https://github.com/OuYangJinTing/ar_cache/commit/4ec14e9e762abb57a8ff18aa8c93a514db49c552)]: Optimize association cache, only cacheable association use ArCache query now.
 
 ## 1.2.0 (2021-03-12 UTC)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar_cache (1.3.0)
+    ar_cache (1.4.0)
       activerecord (>= 6.1, < 7)
 
 GEM

data/lib/ar_cache/active_record.rb

@@ -6,6 +6,8 @@ require 'ar_cache/active_record/core'
 require 'ar_cache/active_record/persistence'
 require 'ar_cache/active_record/insert_all'
 require 'ar_cache/active_record/associations/association'
+require 'ar_cache/active_record/associations/singular_association'
+require 'ar_cache/active_record/associations/has_one_through_association'
 require 'ar_cache/active_record/connection_adapters/abstract/transaction'
 require 'ar_cache/active_record/connection_adapters/abstract/database_statements'
 
@@ -24,6 +26,8 @@ ActiveSupport.on_load(:active_record, run_once: true) do
   ActiveRecord::Relation.prepend(ArCache::ActiveRecord::Relation)
 
   ActiveRecord::Associations::Association.prepend(ArCache::ActiveRecord::Associations::Association)
+  ActiveRecord::Associations::SingularAssociation.prepend(ArCache::ActiveRecord::Associations::SingularAssociation)
+  ActiveRecord::Associations::HasOneThroughAssociation.prepend(ArCache::ActiveRecord::Associations::HasOneThroughAssociation)
 
   ActiveRecord::ConnectionAdapters::NullTransaction.prepend(ArCache::ActiveRecord::ConnectionAdapters::NullTransaction)
   ActiveRecord::ConnectionAdapters::RealTransaction.prepend(ArCache::ActiveRecord::ConnectionAdapters::Transaction)

data/lib/ar_cache/active_record/associations/association.rb

@@ -4,32 +4,9 @@ module ArCache
   module ActiveRecord
     module Associations
       module Association
-        PRELOADER = ::ActiveRecord::Associations::Preloader.new
-
         def reload(...)
           loaded? ? ArCache.skip { super } : super
         end
-
-        # TODO: Implement CollectionAssociation cache
-        private def find_target # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
-          return super if ArCache.skip? || reflection.collection?
-          return super unless ArCache.cache_reflection?(reflection) do
-            if reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
-              ArCache::Query.new(owner.association(through_reflection.name).scope).exec_queries_cacheable? &&
-              ArCache::Query.new(through_reflection.klass.new.association(reflection.source_reflection_name).scope)
-                            .exec_queries_cacheable?
-            else
-              ArCache::Query.new(scope).exec_queries_cacheable?
-            end
-          end
-
-          if (owner.strict_loading? || reflection.strict_loading?) && owner.validation_context.nil?
-            ::ActiveRecord::Base.strict_loading_violation!(owner: owner.class, reflection: reflection)
-          end
-
-          PRELOADER.preload(owner, reflection.name)
-          Array.wrap(owner.association(reflection.name).target)
-        end
       end
     end
   end

data/lib/ar_cache/active_record/associations/has_one_through_association.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ArCache
+  module ActiveRecord
+    module Associations
+      module HasOneThroughAssociation
+        PRELOADER = ::ActiveRecord::Associations::Preloader.new
+
+        private def find_target
+          return super if ArCache.skip?
+          return super unless ArCache.cache_reflection?(reflection) do
+            ArCache::Query.new(owner.association(through_reflection.name).scope).exec_queries_cacheable? &&
+            ArCache::Query.new(source_reflection.active_record.new.association(source_reflection.name).scope)
+                          .exec_queries_cacheable?
+          end
+
+          if (owner.strict_loading? || reflection.strict_loading?) && owner.validation_context.nil?
+            Base.strict_loading_violation!(owner: owner.class, reflection: reflection)
+          end
+
+          PRELOADER.preload(owner, reflection.name)
+          target
+        end
+      end
+    end
+  end
+end

data/lib/ar_cache/active_record/associations/singular_association.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ArCache
+  module ActiveRecord
+    module Associations
+      module SingularAssociation
+        private def skip_statement_cache?(...)
+          return super if ArCache.skip?
+          return true if ArCache.cache_reflection?(reflection) { ArCache::Query.new(scope).exec_queries_cacheable? }
+
+          super
+        end
+      end
+    end
+  end
+end

data/lib/ar_cache/configuration.rb

@@ -41,7 +41,6 @@ module ArCache
       options = tables_options[name.to_sym] || {}
       options[:disabled] = disabled unless options.key?(:disabled)
       options[:select_disabled] = select_disabled unless options.key?(:select_disabled)
-      options[:ignored_columns] = Array(options[:ignored_columns]).map(&:to_s)
       options[:unique_indexes] = Array(options[:unique_indexes]).map { |index| Array(index).map(&:to_s).uniq }.uniq
       options
     end

data/lib/ar_cache/query.rb

@@ -23,10 +23,9 @@ module ArCache
                         end
 
       if missed_relation
-        if table.ignored_columns.any? && relation.select_values.any?
-          missed_relation = missed_relation.reselect(table.column_names)
+        records += relation.find_by_sql(missed_relation.arel, &block).tap do |rs|
+          table.write(rs) if relation.select_values.empty?
         end
-        records += relation.find_by_sql(missed_relation.arel, &block).tap { |rs| table.write(rs) }
       end
 
       records_order(records)
@@ -43,6 +42,7 @@ module ArCache
       return false if relation.klass.ar_cache_table.disabled?
       return false if relation.skip_query_cache_value
       return false if relation.lock_value
+      return false if relation.distinct_value
       return false if relation.group_values.any?
       return false if relation.joins_values.any?
       return false if relation.left_outer_joins_values.any?

data/lib/ar_cache/table.rb

@@ -4,12 +4,11 @@ module ArCache
   class Table
     include Marshal
 
-    OPTIONS = %i[disabled select_disabled unique_indexes ignored_columns].freeze
+    OPTIONS = %i[disabled select_disabled unique_indexes].freeze
 
     singleton_class.attr_reader :all
 
-    attr_reader :name, :primary_key, :unique_indexes, :column_indexes, :column_names, :md5,
-                :ignored_columns, :cache_key_prefix
+    attr_reader :name, :primary_key, :unique_indexes, :column_indexes, :column_names, :md5, :cache_key_prefix
 
     delegate :connection, to: ActiveRecord::Base, private: true
 
@@ -32,10 +31,10 @@ module ArCache
       @unique_indexes = normalize_unique_indexes(options.delete(:unique_indexes), columns).freeze
       options.each { |k, v| instance_variable_set("@#{k}", v) }
       @disabled = true if @primary_key.nil? # ArCache is depend on primary key implementation.
-      @column_names = (columns.map(&:name) - @ignored_columns).freeze
+      @column_names = columns.map(&:name).freeze
       @column_indexes = @unique_indexes.flatten.uniq.freeze
       coder = ArCache::Configuration.coder
-      @md5 = Digest::MD5.hexdigest("#{coder}-#{@disabled}-#{columns.to_json}-#{@ignored_columns.to_json}")
+      @md5 = Digest::MD5.hexdigest("#{coder}-#{@disabled}-#{columns.to_json}")
 
       ArCache::Record.store(self)
 

data/lib/ar_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArCache
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/lib/generators/ar_cache/templates/configuration.rb

@@ -27,7 +27,6 @@ ArCache.configure do |config|
   #     disabled: Boolean,
   #     select_disabled: Boolean,
   #     unique_indexes: Array # eg: [:id, [:name, :statue]], The default is the unique index column of the table.
-  #     ignored_columns: Array # eg: [:created_at, :updated_at], defaule [].
   #   },
   #   ...
   # }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_cache
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - OuYangJinTing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,6 +58,8 @@ files:
 - lib/ar_cache.rb
 - lib/ar_cache/active_record.rb
 - lib/ar_cache/active_record/associations/association.rb
+- lib/ar_cache/active_record/associations/has_one_through_association.rb
+- lib/ar_cache/active_record/associations/singular_association.rb
 - lib/ar_cache/active_record/connection_adapters/abstract/database_statements.rb
 - lib/ar_cache/active_record/connection_adapters/abstract/transaction.rb
 - lib/ar_cache/active_record/core.rb