active_windows 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e84e2dfa5e33f68986b9d63c7875e490ceaaab2f8e1a50a9974c42f883d1b5
-  data.tar.gz: e2565adc58e0a2ccc236970baa804ede27522ce6d3688131bc5a23554cde71e1
+  metadata.gz: b393a3c07582141b6656bbf2f9ffe55193f6fd32c3505af7875a9e6f76fec7d0
+  data.tar.gz: 7571dfc93bc77a96e495b2c74799100320e7bf6666809ceb754ec5fc64efffc9
 SHA512:
-  metadata.gz: 375915ceb4ff9845df08d952bf6e6e48f9e46e07ae4a7857dbca78ea698b7f5025ee634254fd5d8d03c7a7810df4c5ece16406864b4feba8604d7ce98b336770
-  data.tar.gz: 0c4df8c117ab1f49b08bb16f3e7573d2600339ff26bc64bea6f2d42aa3ae5e419ebd4c33e8c833f8e057d919f10ebaf6f0f1713e0077603fb40d5e6cb6b5da93
+  metadata.gz: 8380c1b66b1a1a3c31f9e9c5a9035c43ff7689e499254b4bd7d9b250fbfaeb36054c8a012e49f4f84756a0a6ab8c42bf3a931bad82fda768b07556f955bdac3a
+  data.tar.gz: 92128ba7625b79177654e2f09a76f163d5901ddf2105f84174fe591d81dd020d276fdddb428d76649c0648ac7127f2bfcbee4b539c007221c74be1c6d231ae85

data/lib/active_windows/active_record_extensions.rb

@@ -72,9 +72,18 @@ module ActiveWindows
       raise ArgumentError, "wrong number of arguments (given 0, expected 1+)" if args.empty?
 
       processed = process_window_args(args)
-      arel_nodes = processed.map { |name, options| build_window_function(name, options || {}) }
 
       result = spawn
+
+      # Auto-join has_one associations referenced in partition/order
+      joins_needed = processed.flat_map do |_name, options|
+        next [] unless options.is_a?(Hash)
+        association_joins_for(options[:partition]) + association_joins_for(options[:order])
+      end.uniq
+      result = result.joins(*joins_needed) if joins_needed.any?
+
+      arel_nodes = processed.map { |name, options| build_window_function(name, options || {}) }
+
       # Ensure we keep all columns alongside the window function columns
       result = result.select(klass.arel_table[Arel.star]) if result.select_values.empty?
       result.select(*arel_nodes)
@@ -217,18 +226,31 @@ module ActiveWindows
       if name.is_a?(Arel::Nodes::Node) || name.is_a?(Arel::Nodes::SqlLiteral)
         name
       else
-        klass.arel_table[resolve_column_name(name)]
+        resolve_column(name)
       end
     end
 
-    def resolve_column_name(name)
+    def resolve_column(name)
       name_sym = name.to_sym
-      return name_sym if klass.column_names.include?(name.to_s)
+      return klass.arel_table[name_sym] if klass.column_names.include?(name.to_s)
 
       reflection = klass.reflect_on_association(name_sym)
-      return reflection.foreign_key.to_sym if reflection&.macro == :belongs_to
+      if reflection&.macro == :belongs_to
+        klass.arel_table[reflection.foreign_key.to_sym]
+      elsif reflection&.macro == :has_one
+        reflection.klass.arel_table[reflection.klass.primary_key.to_sym]
+      else
+        klass.arel_table[name_sym]
+      end
+    end
 
-      name_sym
+    def association_joins_for(columns)
+      Array(columns).filter_map do |col|
+        next unless col.is_a?(Symbol) || col.is_a?(String)
+
+        reflection = klass.reflect_on_association(col.to_sym)
+        col.to_sym if reflection&.macro == :has_one
+      end
     end
 
     def arel_order(expr)

data/lib/active_windows/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveWindows
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_windows
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrei Andriichuk