passive_columns 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c17e42bdf1a6871eb67811732872bfb4d4c280c91d2b6f4a76442efbf1379f5
-  data.tar.gz: dd7937cad9f31dabf925cd15dbf051b06682483bbfeb884a713c113281bce613
+  metadata.gz: baf809905aa69dc2f9ee36bcb51c2c2187790c2d2455fdb0ba828546c260625f
+  data.tar.gz: 005e105b072004ef89f410d4470a760be689b589a9f767c6a907e31e7ffd9644
 SHA512:
-  metadata.gz: 8c40fdcc4543ea47e4e945819a3e03328203d7157f17c0b2170cddadf45024b5dbafe7e6bf5fa8045678cf4f63b28b667f63fe49f3217ff9abffd9b2c0c9a4ef
-  data.tar.gz: 8d13c82243de48de75116e986ba12c96949c5ad9151801dcecc9fd2da0f6f6d8ecef5cad7c23125e98571c77af582771ed9e2cbba43d63a293fdbc4f030d8fb1
+  metadata.gz: 02f54e4528a456f37d07e6340bbc0aeb01c672db28002ad681d5394c8d4617f3bf50ae97b1eaaa13c1d4561712554e95d5612ec239fe0bf2f246db2316f2cf6c
+  data.tar.gz: 72b5738f265fdc05deb98defee7853fc37427ed8922e19f0e1911bffd9cbe20e48a5a62b49afc188096e6cb9a01c958b1b851f7a1fca709d2332ea10ad4c585f

data/lib/passive_columns/active_record_relation_extension.rb

@@ -4,11 +4,20 @@ 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(...)
+        if klass.try(:_passive_columns).present? && select_values.blank?
+          self.select_values = klass.column_names - klass._passive_columns
+        end
+        super
+      end
+    else
+      def exec_queries(...)
+        if klass.try(:_passive_columns).present? && select_values.blank?
+          self.select_values = klass.column_names - klass._passive_columns
+        end
+        super
       end
-      super
     end
 
     def to_sql

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.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_columns
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Golovin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-07-16 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