active_record-union_relation 0.1.0 → 0.2.0

data/lib/active_record/union_relation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_record'
-require 'active_record/union_relation/version'
+require "active_record"
+require "active_record/union_relation/version"
 
 module ActiveRecord
   class UnionRelation
@@ -21,7 +21,7 @@ module ActiveRecord
     # raise this error so there's not some weird undefined method behavior.
     class NoConfiguredSubqueriesError < Error
       def initialize
-        super('No subqueries have been configured for this union')
+        super("No subqueries have been configured for this union")
       end
     end
 
@@ -31,7 +31,7 @@ module ActiveRecord
       # Sometimes you need some columns in some subqeries that you don't need in
       # others. In order to accomplish that and still maintain the matching
       # number of columns, you can put a null in space of a column instead.
-      NULL = Arel.sql('NULL')
+      NULL = Arel.sql("NULL")
 
       attr_reader :relation, :model_name, :sources
 
@@ -42,18 +42,20 @@ module ActiveRecord
       end
 
       def to_arel(columns, discriminator)
-        relation
-          .select(
-            Arel.sql("'#{model_name}'").as(quote_column_name(discriminator)),
-            *sources.zip(columns).map do |(source, column)|
+        relation.select(
+          Arel.sql("'#{model_name}'").as(quote_column_name(discriminator)),
+          *sources
+            .zip(columns)
+            .map do |(source, column)|
               Arel.sql(source.to_s).as(quote_column_name(column))
             end
-          )
-          .arel
+        ).arel
       end
 
       def to_mapping(columns)
-        [model_name, columns.zip(sources).to_h]
+        # 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]
       end
 
       private
@@ -96,16 +98,45 @@ module ActiveRecord
       mappings = subqueries.to_h { |subquery| subquery.to_mapping(columns) }
 
       Class.new(model) do
-        define_singleton_method(:inheritance_column) { discriminator }
-        define_singleton_method(:instantiate) do |attributes, column_types = {}, &block|
-          type = attributes.delete(inheritance_column)
-
-          instantiate_instance_of(
-            Object.const_get(type),
-            attributes.transform_keys(&mappings[type]),
-            column_types,
-            &block
-          )
+        # Set the inheritance column and register the discriminator as a string
+        # column so that Active Record will instantiate the right subclass.
+        self.inheritance_column = discriminator
+        attribute inheritance_column, :string
+
+        define_singleton_method(:instantiate) do |attrs, columns = {}, &block|
+          mapped = {}
+          mapping = mappings[attrs[inheritance_column]]
+
+          # Map the result set columns back to their original source column
+          # names. This ensures that even though the UNION saw them as the same
+          # columns our resulting records see them as their original names.
+          attrs.each do |key, value|
+            case mapping[key]
+            when Subquery::NULL
+              # Ignore columns that didn't have a value.
+            when nil
+              # If we don't have a mapping for this column, then it's the
+              # discriminator. Map that column directly.
+              mapped[key] = value
+            else
+              # Otherwise, use the mapping to map the column back to its
+              # original name.
+              mapped[mapping[key]] = value
+            end
+          end
+
+          # Now that we've mapped all of the columns, we can call super with the
+          # mapped values.
+          super(mapped, columns, &block)
+        end
+
+        # Override the default find_sti_class method because it does sanity
+        # checks to ensure that the class you're trying to instantiate is a
+        # subclass of the current class. Since we want to explicitly _not_ do
+        # that, we will instead just check that it is a valid model class.
+        define_singleton_method(:find_sti_class) do |type_name|
+          type = type_name.constantize
+          type < ActiveRecord::Base ? type : super(type_name)
         end
       end
     end
@@ -113,9 +144,9 @@ module ActiveRecord
     def union_for(model)
       Arel::Nodes::As.new(
         subqueries
-          .map { |subquery| subquery.to_arel(columns, discriminator) }
+          .map { |subquery| subquery.to_arel(columns, discriminator).ast }
           .inject { |left, right| Arel::Nodes::Union.new(left, right) },
-        Arel.sql(model.connection.quote_table_name('union'))
+        Arel.sql(model.connection.quote_table_name("union"))
       )
     end
   end
@@ -129,7 +160,7 @@ module ActiveRecord
   # One additional column will be added to the query in order to discriminate
   # between all of the unioned types. Then when the objects are going to be
   # instantiated, we map the columns back to their original names.
-  def self.union(*columns, discriminator: 'discriminator')
+  def self.union(*columns, discriminator: "discriminator")
     UnionRelation.new(columns, discriminator).tap { |union| yield union }.all
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-union_relation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
-- Kevin Deisz
-autorequire: 
+- Kevin Newton
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,69 +28,69 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
-description: 
+        version: '0'
+description:
 email:
-- kevin.deisz@gmail.com
+- kddnewton@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/auto-merge.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
-- ".mergify.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -101,13 +101,23 @@ files:
 - active_record-union_relation.gemspec
 - bin/console
 - bin/setup
+- gemfiles/mysql/Gemfile
+- gemfiles/mysql/Gemfile.lock
+- gemfiles/postgresql/Gemfile
+- gemfiles/postgresql/Gemfile.lock
+- gemfiles/sqlite/Gemfile
+- gemfiles/sqlite/Gemfile.lock
 - lib/active_record/union_relation.rb
 - lib/active_record/union_relation/version.rb
-homepage: https://github.com/kddeisz/active_record-union_relation
+homepage: https://github.com/kddnewton/active_record-union_relation
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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.0/CHANGELOG.md
+  source_code_uri: https://github.com/kddnewton/active_record-union_relation
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Create ActiveRecord relations from UNIONs
 test_files: []

data/.mergify.yml

@@ -1,10 +0,0 @@
-pull_request_rules:
-  - name: Automatically merge dependencies
-    conditions:
-      - base=master
-      - label=dependencies
-      - status-success=CI
-    actions:
-      merge:
-        strict: true
-      delete_head_branch: {}