active_record-union_relation 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75105a966e30a6a18ed59c42c39bd22d5685e60b3f8d96eba472a2f5b894507
-  data.tar.gz: 86a4699ab3cb5f6af0d2748607d16de5ab4b1b100cf0cd41ab26b1707686b79e
+  metadata.gz: 85cab300b41481aa6b308293a0cad8d5d57ba6cb69d7038584aa6d6853e8871b
+  data.tar.gz: 3519ebba7762500a87dc12239ed6eba82cfc411bc2f75c894e78c2777283393b
 SHA512:
-  metadata.gz: 4ba4ea419535dc83c1466220fc6546a76c3970fb3152d210a98dc7a40eac7fef54b127d3e1056bc9e257c4fd30a419bf3a186da5334205ef096de74248effd5f
-  data.tar.gz: 4cac1923b62d6505ee0cb0701329d61164a8e2301bad505d93c01b31a70fb1bc4d981cf87cf9ea68455be35458bde4c76a2eca67570ff527026bfb8f500e4592
+  metadata.gz: af74e42519746bddea42fc1dc86988f87db85afd5de8cc3cfb141b9d59bf601510ba74a717eed8cd2aabb5b2dac0e66f0a95ba87b90aca21fdacbb79e9e04319
+  data.tar.gz: b4b49cbf3975e6577b0a9c4e3683d318d9f8d312b2e63ec0b4bc127e9ae979a91e7f575d8d00cf195fe9648ae30f3af4df4269f2c05586e47a1fe28a95a2e6c1

data/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.3.0] - 2024-06-13
+
+### Added
+
+- Support relations that are using models that have descendants through STI.
+
 ## [0.2.1] - 2024-05-29
 
 ### Changed
@@ -31,7 +37,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release. 🎉
 
-[unreleased]: https://github.com/kddnewton/active_record-union_relation/compare/v0.2.1...HEAD
+[unreleased]: https://github.com/kddnewton/active_record-union_relation/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/kddnewton/active_record-union_relation/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/kddnewton/active_record-union_relation/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/kddnewton/active_record-union_relation/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/kddnewton/active_record-union_relation/compare/v0.1.0...v0.1.1

data/lib/active_record/union_relation/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   class UnionRelation
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/lib/active_record/union_relation.rb

@@ -33,17 +33,68 @@ module ActiveRecord
       # number of columns, you can put a null in space of a column instead.
       NULL = Arel.sql("NULL")
 
+      # A model name for a model that is not using single-table inheritance. In
+      # this case we use the model name itself as the discriminator and only
+      # need one entry in the mappings hash that maps records to the columns
+      # that we are pulling from the result.
+      class SingleModelName
+        attr_reader :name
+
+        def initialize(name)
+          @name = name
+        end
+
+        def each_name
+          yield name
+        end
+
+        def to_sql
+          Arel.sql("'#{name}'")
+        end
+      end
+
+      # A model name for a model that is using single-table inheritance. In this
+      # case we use the inheritance column as the discriminator and need to
+      # include all of the subclasses in the mappings hash.
+      class MultiModelName
+        attr_reader :inheritance_column, :names
+
+        def initialize(inheritance_column, names)
+          @inheritance_column = inheritance_column
+          @names = names
+        end
+
+        def each_name(&block)
+          names.each(&block)
+        end
+
+        def to_sql
+          Arel.sql(inheritance_column)
+        end
+      end
+
       attr_reader :relation, :model_name, :sources
 
       def initialize(relation, sources)
         @relation = relation
-        @model_name = relation.model.name
+
+        model = relation.model
+        @model_name =
+          if model._has_attribute?(model.inheritance_column)
+            MultiModelName.new(
+              quote_column_name(model.inheritance_column),
+              model.descendants.map(&:name)
+            )
+          else
+            SingleModelName.new(model.name)
+          end
+
         @sources = sources.map { |source| source ? source.to_s : NULL }
       end
 
       def to_arel(columns, discriminator)
         relation.select(
-          Arel.sql("'#{model_name}'").as(quote_column_name(discriminator)),
+          model_name.to_sql.as(quote_column_name(discriminator)),
           *sources
             .zip(columns)
             .map do |(source, column)|
@@ -52,10 +103,11 @@ module ActiveRecord
         ).arel
       end
 
-      def to_mapping(columns)
+      def merge_mappings(mappings, columns)
         # Remove the scope_name/table_name when using table_name.column
-        sources_without_scope = sources.map { _1.split(".").last }
-        [model_name, columns.zip(sources_without_scope).to_h]
+        mapping =
+          columns.zip(sources.map { |source| source.split(".").last }).to_h
+        model_name.each_name { |name| mappings[name] = mapping }
       end
 
       private
@@ -95,7 +147,9 @@ module ActiveRecord
 
     def subclass_for(model)
       discriminator = self.discriminator
-      mappings = subqueries.to_h { |subquery| subquery.to_mapping(columns) }
+
+      mappings = {}
+      subqueries.each { |subquery| subquery.merge_mappings(mappings, columns) }
 
       Class.new(model) do
         # Set the inheritance column and register the discriminator as a string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-union_relation
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -99,7 +99,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/kddnewton/active_record-union_relation/issues
-  changelog_uri: https://github.com/kddnewton/active_record-union_relation/blob/v0.2.1/CHANGELOG.md
+  changelog_uri: https://github.com/kddnewton/active_record-union_relation/blob/v0.3.0/CHANGELOG.md
   source_code_uri: https://github.com/kddnewton/active_record-union_relation
   rubygems_mfa_required: 'true'
 post_install_message: