passive_columns 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c17e42bdf1a6871eb67811732872bfb4d4c280c91d2b6f4a76442efbf1379f5
-  data.tar.gz: dd7937cad9f31dabf925cd15dbf051b06682483bbfeb884a713c113281bce613
+  metadata.gz: 3c37d7d720dab3e13b2084d7f6277a35b1d99de88b75eae8ef67b89d67472172
+  data.tar.gz: 5ada8404f4509e694764d732892c2833d71c94c959c7ae45c080266781473e7e
 SHA512:
-  metadata.gz: 8c40fdcc4543ea47e4e945819a3e03328203d7157f17c0b2170cddadf45024b5dbafe7e6bf5fa8045678cf4f63b28b667f63fe49f3217ff9abffd9b2c0c9a4ef
-  data.tar.gz: 8d13c82243de48de75116e986ba12c96949c5ad9151801dcecc9fd2da0f6f6d8ecef5cad7c23125e98571c77af582771ed9e2cbba43d63a293fdbc4f030d8fb1
+  metadata.gz: b0ed4cbe6220e1752cb6f98e7b555f31bd178db3941f4a8c2e2d5fb022b3e00eb9abffc71a90cdb29f23fad14cc004e573850d51f9b18b1df3e0e05f4747d32e
+  data.tar.gz: c73cf064d995e5c9705f609319e4f0609616d346cc17d1a41a8f4efe98cd5cbd934008ca6c0b7a3226d9a9967323038b0bf0fcf9e33f9c5b6ac3d199f86635f2

data/lib/passive_columns/active_record_relation_extension.rb

@@ -4,11 +4,16 @@ module PassiveColumns
   # ActiveRecordRelationExtension is a module that extends ActiveRecord::Relation
   # to automatically select all columns except passive columns if no columns are selected.
   module ActiveRecordRelationExtension
-    def exec_main_query(**args)
-      if klass.try(:_passive_columns).present? && select_values.blank?
-        self.select_values = klass.column_names - klass._passive_columns
+    if ActiveRecord::VERSION::MAJOR >= 7
+      def exec_main_query(...)
+        PassiveColumns.apply_select_scope_to(self)
+        super
+      end
+    else
+      def exec_queries(...)
+        PassiveColumns.apply_select_scope_to(self)
+        super
       end
-      super
     end
 
     def to_sql
@@ -17,10 +22,7 @@ module PassiveColumns
       # @see ActiveRecord::QueryMethods::assert_mutability!
       return super if @loaded || (defined?(@arel) && @arel)
 
-      if klass.try(:_passive_columns).present? && select_values.blank?
-        self.select_values = klass.column_names - klass._passive_columns
-      end
-
+      PassiveColumns.apply_select_scope_to(self)
       super
     end
   end

data/lib/passive_columns/loader.rb

@@ -5,7 +5,7 @@ module PassiveColumns
   class Loader
     attr_reader :passive_columns, :model
 
-    # @param [LazyColumns] model
+    # @param [ActiveRecord::Base] model
     # @param [Array<Symbol>] passive_columns
     def initialize(model, passive_columns)
       @model = model
@@ -35,8 +35,16 @@ module PassiveColumns
       model.class.unscoped.where(identity_constraints).pick(column)
     end
 
-    def identity_constraints
-      @identity_constraints ||= model.send(:_query_constraints_hash)
+    if ActiveRecord::VERSION::MAJOR >= 7
+      def identity_constraints
+        @identity_constraints ||= model.send(:_query_constraints_hash)
+      end
+    else
+      def identity_constraints
+        @identity_constraints ||= {
+          model.instance_variable_get(:@primary_key) => model.id_in_database
+        }
+      end
     end
   end
 end

data/lib/passive_columns/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PassiveColumns
-  VERSION = '0.2.3'
+  VERSION = '0.3.1'
 end

data/lib/passive_columns.rb

@@ -93,6 +93,28 @@ module PassiveColumns
       end
       super(name, *filter_list, opts, &block)
     end
+
+    def cached_find_by_statement(key, &block)
+      cache = @find_by_statement_cache[connection.prepared_statements]
+      cache.compute_if_absent(key) do
+        ActiveRecord::StatementCache.create(connection) do |params|
+          relation = block.call params
+          PassiveColumns.apply_select_scope_to(relation)
+          relation
+        end
+      end
+    end
+  end
+
+  # This method is used to apply the select scope to the relation.
+  # It is used to automatically select all columns except passive columns if no columns are selected.
+  # @param [ActiveRecord::Relation] relation
+  # @return [void]
+  def self.apply_select_scope_to(relation)
+    return if relation.klass.try(:_passive_columns).blank?
+    return if relation.select_values.present?
+
+    relation.select_values = relation.klass.column_names - relation.klass._passive_columns
   end
 
   # This method loads a column value, if not already loaded, from the database

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_columns
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmitry Golovin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A gem that extends Active Record to retrieve columns from a db on demand