activerecord_where_assoc 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef06d95cd1fa0b3de7d06e745fc1a527bdc86415adb2e6b36b86b1f1477e804
-  data.tar.gz: 36a723c284fbb1e0b44ea9af5368995d504a53026817f545a14235212d4ae7bf
+  metadata.gz: ad309caebf6c729645f97a3c76959f0e61557b956fe86fe13dac641af06f87d4
+  data.tar.gz: 7f4967c6493d13550f31036753a50606f7e82f9fed1d5277b06db899517e89ec
 SHA512:
-  metadata.gz: 8a26660a18b817b6a5cd106e71413e064f899e6fb9c73e9f502a14fc5aeb2896412368bc932028300611c94adac234ebbff85d0e2fd3ed8b900c01fa6c5e2670
-  data.tar.gz: febe936611a53bc9f2f75aeb639fe8d8b905304b9b910e71f5cc9020ab1c0fae6803cd303f0cd7b830e29aa092778df21ce0303150f876930a02be2ed831821e
+  metadata.gz: 0efde09f38bd4c4913ac3b4cb36d114cb654c0c35bd05c07eb31559801d9febb87b479d9ae41b6bc07d9d77ddef775fd3b1e307ea20a3a10ccf2b829f03f27f1
+  data.tar.gz: ef3d2dbfef7f58f0221cdf5c32448410a1886fd1b8532bbe2d4a8643d5bde2dad5c2029eeddf5cb1b6620ab199b6ec2e3bd313ddd505d648a90d2d2f619b2747

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# 1.2.1 - 2024-12-05
+
+* Optimize `has_one` handling for `#where_assoc_exists` with a `has_one` as last association + without any conditions or offset.
+* Optimize `has_one` handling when the foreign_key has a unique index and there is no offset
+
 # 1.2.0 - 2024-08-31
 
 * Add support for composite primary keys in Rails 7.2

data/lib/active_record_where_assoc/active_record_compat.rb

@@ -101,5 +101,28 @@ module ActiveRecordWhereAssoc
         reflection.is_a?(ActiveRecord::NullRelation)
       end
     end
+
+    if ActiveRecord.gem_version >= Gem::Version.new("6.0")
+      def self.indexes(model)
+        model.connection.schema_cache.indexes(model.table_name)
+      end
+    else
+      def self.indexes(model)
+        model.connection.indexes(model.table_name)
+      end
+    end
+
+    @unique_indexes_cache = {}
+    def self.has_unique_index?(model, column_names)
+      column_names = Array(column_names).map(&:to_s)
+      @unique_indexes_cache.fetch([model, column_names]) do |k|
+        unique_indexes = indexes(model).select(&:unique)
+        columns_names_set = Set.new(column_names)
+
+        # We check for an index whose columns are a subset of the columns we specify
+        # This way, a composite column_names will find uniqueness if just a single of the column is unique
+        @unique_indexes_cache[k] = unique_indexes.any? { |ui| Set.new(ui.columns) <= columns_names_set }
+      end
+    end
   end
 end

data/lib/active_record_where_assoc/core_logic.rb

@@ -155,9 +155,17 @@ module ActiveRecordWhereAssoc
 
         init_scopes = initial_scopes_from_reflection(record_class, reflection_chain[i..-1], constraints_chain[i], options)
         current_scopes = init_scopes.map do |alias_scope, current_scope, klass_scope|
-          current_scope = process_association_step_limits(current_scope, reflection, record_class, options)
-
           if i.zero?
+            if given_conditions || klass_scope || last_assoc_block || current_scope.offset_value || nest_assocs_block == NestWithSumBlock
+              # In the deepest layer, the limit & offset complexities only matter when:
+              # * There is a condition to apply
+              # * There is an offset (which is a form of filtering)
+              # * We are counting the total matches
+              # Since last_assoc_block is always set except for the deepest association, and is only unset for the deepest layer if
+              # there is no condition given, using it as part of the condition does a lot of work here.
+              current_scope = process_association_step_limits(current_scope, reflection, record_class, options)
+            end
+
             current_scope = current_scope.where(given_conditions) if given_conditions
             if klass_scope
               if klass_scope.respond_to?(:call)
@@ -167,6 +175,8 @@ module ActiveRecordWhereAssoc
               end
             end
             current_scope = apply_proc_scope(current_scope, last_assoc_block) if last_assoc_block
+          else
+            current_scope = process_association_step_limits(current_scope, reflection, record_class, options)
           end
 
           # Those make no sense since at this point, we are only limiting the value that would match using conditions
@@ -338,10 +348,18 @@ module ActiveRecordWhereAssoc
 
       current_scope = current_scope.limit(1) if reflection.macro == :has_one
 
-      # Order is useless without either limit or offset
-      current_scope = current_scope.unscope(:order) if !current_scope.limit_value && !current_scope.offset_value
+      if !current_scope.offset_value
+        if current_scope.limit_value
+          join_keys = ActiveRecordCompat.join_keys(reflection, nil)
+          # #join_keys is inverted... the foreign key is on the "source" table, and the key is on the "target" table...
+          # Everything is so complicated in ActiveRecord.
+          current_scope = current_scope.unscope(:limit) if ActiveRecordCompat.has_unique_index?(current_scope.model, join_keys.key)
+        end
+
+        # Order is useless without either limit or offset
+        return current_scope.unscope(:order) if !current_scope.limit_value
+      end
 
-      return current_scope unless current_scope.limit_value || current_scope.offset_value
       if %w(mysql mysql2).include?(relation_klass.connection.adapter_name.downcase)
         msg = String.new
         msg << "Associations and default_scopes with a limit or offset are not supported for MySQL (this includes has_many). "

data/lib/active_record_where_assoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordWhereAssoc
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_where_assoc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Maxime Handfield Lapointe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord