active_record_union 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc119e16853585b8595e9c7cf0de7b1282f30411
-  data.tar.gz: eea98a19c016f681636e982ffffb9180e3876e4c
+SHA256:
+  metadata.gz: b321a0fac09cf1cc331b5526f907b8dd78844796ed473093396dc08297997415
+  data.tar.gz: 020d7aca83f28ecfbf9455c48049f70c7fa0389ec72904c743fd724fd314ad05
 SHA512:
-  metadata.gz: efa7fa3f32874d1052bf39f54b4e80e9135980bee70604bf18d12759ba42a5a8ca653427d78ea4ebb9ac6081654a91488ee6758c443d80f7e454061576b7d9f5
-  data.tar.gz: db0f08034881ebe394d656b3b6f997719aaff48dcc979602ca68d8202454182583d50761e725de811bc35e23b5fcf66286947d868bcf1d14dbb103b22ca0ea65
+  metadata.gz: 35cb47fc2d57a16a74dbad2995cd90b87eecdea1a5aca340d8543cb504b73cd2a9cbbdb0e0c6cc4b71b416fcc04f3aa884f588067c316a0cc03dd60e9b5b376d
+  data.tar.gz: d0dff7b05b27f31b82d00ffe2f8cb5537b5c91a345ec31b02015cb31d020ace156277f8a9f6a8bac3c326f3890f5202213c909ec94435aac46a8be7a169b0ba9

data/.github/workflows/testing.yml

@@ -0,0 +1,70 @@
+name: RSpec Test Matrix
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      postgresql:
+        image: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          POSTGRES_DB: active_record_union
+          POSTGRES_USER: active_record_union
+          POSTGRES_PASSWORD: active_record_union
+
+      mysql2:
+        image: mysql:8.0
+        env:
+          MYSQL_DATABASE: active_record_union
+          MYSQL_ROOT_PASSWORD: active_record_union
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+        ports:
+          - "3306:3306"
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # just define specific versions for each rails version
+        include:
+          - ruby: 2.6
+            rails: "6.0"
+          - ruby: "3.0"
+            rails: 6.1
+          - ruby: 3.1
+            rails: "7.0"
+          - ruby: 3.2
+            rails: 7.1
+          - ruby: 3.2
+            rails: 7.2
+          - ruby: 3.3
+            rails: "8.0"
+
+    env:
+      BUNDLE_GEMFILE: "rails_${{ matrix.rails }}.gemfile"
+      DB_HOST: 127.0.0.1
+      MYSQL_ROOT_HOST: "%"
+      MYSQL_DB: active_record_union
+      MYSQL_USER: root
+      MYSQL_PASSWORD: active_record_union
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # install gems and cache
+
+      - run: bundle exec rspec --force-color --format d

data/Gemfile

@@ -0,0 +1,4 @@
+# this is just a convenience for out of the box development
+source 'https://rubygems.org'
+
+eval_gemfile File.expand_path('./rails_8.0.gemfile', __dir__)

data/README.md

@@ -17,6 +17,10 @@ user_1.posts.union(user_2.posts).union(Post.published)
 user_1.posts.union_all(user_2.posts)
 ```
 
+ActiveRecordUnion is tested against Rails 6.0, 6.1, 7.0, 7.1, 7.2 and 8.0.
+
+If you are using Postgres, you might alternatively check out [ActiveRecordExtended](https://github.com/georgekaraszi/ActiveRecordExtended) which includes support for unions as well as other goodies.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -127,7 +131,7 @@ SELECT "posts".* FROM (
 
 There's a couple things to be aware of when using ActiveRecordUnion:
 
-1. ActiveRecordUnion with raise an error if you try to UNION any relations that do any preloading/eager-loading. There's no sensible way to do the preloading in the subselects. If enough people complain maybe we can change ActiveRecordUnion to let the queries run anyway but without preloading any records.
+1. ActiveRecordUnion will raise an error if you try to UNION any relations that do any preloading/eager-loading. There's no sensible way to do the preloading in the subselects. If enough people complain, maybe, we can change ActiveRecordUnion to let the queries run anyway but without preloading any records.
 2. There's no easy way to get SQLite to allow ORDER BY in the UNION subselects. If you get a syntax error, you can either write `my_relation.reorder(nil).union(other.reorder(nil))` or switch to Postgres.
 
 ## Another nifty way to reduce extra queries
@@ -184,6 +188,12 @@ This is a gem not a Rails pull request because the standard of code quality for
 
 ## Changelog
 
+**1.4.0** - October 1, 2025
+  - Ready for Rails 8.0! Support for Rails < 6 dropped. Updates provided by [@timdiggins](https://github.com/frederikspang) and [@frederikspang](https://github.com/frederikspang).
+
+**1.3.0** - January 14, 2018
+  - Ready for Rails 5.2! Updates provided by [@glebm](https://github.com/glebm).
+
 **1.2.0** - June 26, 2016
   - Ready for Rails 5.0! Updates provided by [@glebm](https://github.com/glebm).
 
@@ -209,9 +219,9 @@ This public domain dedication follows the the CC0 1.0 at https://creativecommons
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Run the tests:
   1. Install MySQL and PostgreSQL.
-  2. You may need to create a `test_active_record_union` database on each under the default user.
-  3. Run `rake` to test with all supported Rails versions.
-  4. Run `rake test_rails_4_2` or `rake test_rails_5_0` to test a specific Rails version.
+  2. You need to be able to connect to a local MySQL and Postgres database as the default user, so the specs can create a `test_active_record_union` database. To set up the users this test expects, execute `bin/create-db-users` (or set the environment variables referenced in `spec/support/databases.rb`).
+  3. Run `rake` to test with all supported Rails versions. All needed dependencies will be installed via Bundler (`gem install bundler` if you happen not to have Bundler yet).
+  4. Run `rake test_rails_8_0` or `rake test_rails_7_2` etc. to test a specific Rails version.
 4. There is also a `bin/console` command to load up a REPL for playing around
 5. Commit your changes (`git commit -am 'Add some feature'`)
 6. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -51,11 +51,11 @@ end
 
 
 TestTasks.gemfiles.each do |gemfile|
-  rails_version_underscored = gemfile[/rails_(.+)\.gemfile/, 1]
+  rails_version = gemfile[/rails_(.+)\.gemfile/, 1]
 
-  desc "Test Rails #{rails_version_underscored.gsub("_", ".")}"
-  task :"test_rails_#{rails_version_underscored}" do
+  desc "Test Rails #{rails_version}"
+  task :"test_rails_#{rails_version.gsub(".", "_")}" do
     env = { 'BUNDLE_GEMFILE' => gemfile }
     TestTasks.run_one(env)
   end
-end
+end

data/active_record_union.gemspec

@@ -18,13 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/}) + spec.files.grep(%r{^bin/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.0"
+  spec.add_dependency "activerecord", ">= 6.0"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec",   "~> 3.0"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "pg"
-  spec.add_development_dependency "mysql2"
 end

data/bin/create-db-users

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+GREEN='\033[0;32m'
+RESET_COLOR='\033[0m'
+
+if [ -n "$1" ]; then cat <<'HELP'; exit; fi
+Usage: bin/create-db-users
+Create the active_record_union database users for all the supported databases.
+If the `DB` environment variable is set, do the above only for that database.
+HELP
+
+USER='active_record_union'
+PASS='active_record_union'
+
+set -e
+log() { if [ -t 1 ]; then echo -e >&2 "${GREEN}create-db-users: $@${RESET_COLOR}"; else echo >&2 "$@"; fi }
+
+create_mysql_user() {
+  if mysql -s -u"$USER" -p"$PASS" -e '' 2>/dev/null; then return; fi
+  log "Creating MySQL '$USER' user. MySQL root password required."
+  mysql --verbose -uroot -p <<SQL
+CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASS';
+GRANT ALL PRIVILEGES ON \`test_active_record_union\`.* TO '$USER'@'localhost';
+SQL
+}
+
+create_postgresql_user() {
+  if PGPASSWORD="$PASS" psql -h 127.0.0.1 postgres -U $USER -c ''; then return; fi
+  log "Creating Postgres '$USER' user."
+  local cmd='psql postgres'
+  if ! $cmd -c '' 2>/dev/null; then
+    log "sudo required:"
+    cmd="sudo -u ${PG_DAEMON_USER:-postgres} psql postgres"
+  fi
+#  need to also create database first time
+  $cmd --echo-all <<SQL
+CREATE ROLE $USER LOGIN PASSWORD '$PASS';
+ALTER ROLE $USER CREATEDB;
+CREATE DATABASE active_record_union;
+SQL
+}
+
+[ -z "$DB" -o "$DB" = 'mysql2' ] && create_mysql_user
+[ -z "$DB" -o "$DB" = 'postgresql' ] && create_postgresql_user

data/lib/active_record_union/active_record/relation/union.rb

@@ -18,32 +18,31 @@ module ActiveRecord
       private
 
       def set_operation(operation, relation_or_where_arg, *args)
-        other = if args.size == 0 && Relation === relation_or_where_arg
+        other = if args.empty? && relation_or_where_arg.is_a?(Relation)
                   relation_or_where_arg
                 else
-                  @klass.where(relation_or_where_arg, *args)
+                  self.klass.where(relation_or_where_arg, *args)
                 end
 
         verify_relations_for_set_operation!(operation, self, other)
 
+        left = self.arel.ast
+        right = other.arel.ast
+
         # Postgres allows ORDER BY in the UNION subqueries if each subquery is surrounded by parenthesis
-        # but SQLite does not allow parens around the subqueries; you will have to explicitly do `relation.reorder(nil)` in SQLite
-        if Arel::Visitors::SQLite === self.connection.visitor
-          left, right = self.ast, other.ast
-        else
-          left, right = Arel::Nodes::Grouping.new(self.ast), Arel::Nodes::Grouping.new(other.ast)
+        # but SQLite does not allow parens around the subqueries
+        unless self.connection.visitor.is_a?(Arel::Visitors::SQLite)
+          left = Arel::Nodes::Grouping.new(left)
+          right = Arel::Nodes::Grouping.new(right)
         end
 
         set  = SET_OPERATION_TO_AREL_CLASS[operation].new(left, right)
-        from = Arel::Nodes::TableAlias.new(set, @klass.arel_table.name)
-        if ActiveRecord::VERSION::MAJOR >= 5
-          relation             = @klass.unscoped.spawn
-          relation.from_clause = UnionFromClause.new(from, nil, self.bound_attributes + other.bound_attributes)
-        else
-          relation             = @klass.unscoped.from(from)
-          relation.bind_values = self.arel.bind_values + self.bind_values + other.arel.bind_values + other.bind_values
-        end
-        relation
+        from = Arel::Nodes::TableAlias.new(set, self.klass.arel_table.name)
+        build_union_relation(from, other)
+      end
+
+      def build_union_relation(arel_table_alias, _other)
+        self.klass.unscoped.from(arel_table_alias)
       end
 
       def verify_relations_for_set_operation!(operation, *relations)
@@ -63,19 +62,6 @@ module ActiveRecord
           raise ArgumentError.new("Cannot #{operation} relation with eager load.")
         end
       end
-
-      if ActiveRecord::VERSION::MAJOR >= 5
-        class UnionFromClause < ActiveRecord::Relation::FromClause
-          def initialize(value, name, bound_attributes)
-            super(value, name)
-            @bound_attributes = bound_attributes
-          end
-
-          def binds
-            @bound_attributes
-          end
-        end
-      end
     end
   end
 end

data/lib/active_record_union/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUnion
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/rails_6.0.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 6.0.0'
+
+# https://github.com/rails/rails/blob/v6.0.6.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+gem "pg", ">= 0.18", "< 2.0"
+
+# https://github.com/rails/rails/blob/v6.0.2/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem "sqlite3", "~> 1.4"
+
+# https://github.com/rails/rails/blob/v6.0.6.1/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+gem "mysql2", ">= 0.4.4"
+

data/rails_6.1.gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 6.1.0'
+
+# https://github.com/rails/rails/blob/v6.1.7.10/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+gem "pg", "~> 1.1"
+
+# https://github.com/rails/rails/blob/v6.1.2/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem "sqlite3", "~> 1.4"
+
+# https://github.com/rails/rails/blob/v6.1.7.10/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+gem "mysql2", "~> 0.5"
+

data/rails_7.0.gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 7.0.0'
+
+# https://github.com/rails/rails/blob/v7.0.2/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem 'sqlite3', '~> 1.4'
+
+# https://github.com/rails/rails/blob/v7.0.2/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
+gem 'pg', '~> 1.1'
+
+# https://github.com/rails/rails/blob/v7.0.2/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'mysql2', '~> 0.5'

data/rails_7.1.gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 7.1.0'
+
+# https://github.com/rails/rails/blob/v7.1.2/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem 'sqlite3', '~> 1.4'
+
+# https://github.com/rails/rails/blob/v7.1.2/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
+gem 'pg', '~> 1.1'
+
+# https://github.com/rails/rails/blob/v7.1.2/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'mysql2', '~> 0.5'

data/rails_7.2.gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 7.2.0'
+
+# https://github.com/rails/rails/blob/v7.2.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem 'sqlite3', '>= 1.4'
+
+# https://github.com/rails/rails/blob/v7.2.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
+gem 'pg', '~> 1.1'
+
+# https://github.com/rails/rails/blob/v7.2.0/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'mysql2', '~> 0.5'

data/rails_8.0.gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 8.0.0'
+
+# https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem 'sqlite3', '>= 2.1'
+
+# https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
+gem 'pg', '~> 1.1'
+
+# https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
+gem 'mysql2', '~> 0.5'

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ Databases.connect_to_sqlite
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.backtrace_inclusion_patterns << %r{gems/([0-9.])+/gems/(?!rspec|capybara)} if ENV['BACKTRACE']
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.

data/spec/support/databases.rb

@@ -11,24 +11,47 @@ module Databases
 
   def connect_to_postgres
     ActiveRecord::Base.establish_connection(
-      adapter:  "postgresql"
+      adapter:  "postgresql",
+      host: ENV.fetch('DB_HOST', 'localhost'),
+      username: ENV.fetch("POSTGRES_USER", 'active_record_union'),
+      password: ENV.fetch("POSTGRES_PASSWORD", 'active_record_union')
     )
-    ActiveRecord::Base.connection.recreate_database("test_active_record_union")
+    try_to_drop_database
+    ActiveRecord::Base.connection.create_database("test_active_record_union")
     ActiveRecord::Base.establish_connection(
       adapter:  "postgresql",
-      database: "test_active_record_union"
+      host: ENV.fetch('DB_HOST', 'localhost'),
+      username: ENV.fetch("POSTGRES_USER", 'active_record_union'),
+      password: ENV.fetch("POSTGRES_PASSWORD", 'active_record_union'),
+      database: ENV.fetch("POSTGRES_DB", "test_active_record_union")
     )
     load("support/models.rb")
   end
 
+  def try_to_drop_database
+    ActiveRecord::Base.connection.drop_database("test_active_record_union")
+  rescue ActiveRecord::NoDatabaseError
+    $stderr.puts "Can't drop database 'test_active_record_union' as it doesn't exist"
+  rescue ActiveRecord::ActiveRecordError => e
+    $stderr.puts "Can't drop database 'test_active_record_union' (but continuing anyway): #{e}"
+  rescue => e
+    $stderr.puts "Other error (#{e.class.name}) dropping database 'test_active_record_union' (but continuing anyway): #{e}"
+  end
+
   def connect_to_mysql
     ActiveRecord::Base.establish_connection(
-      adapter:  "mysql2"
+      adapter:  "mysql2",
+      host: ENV.fetch('DB_HOST', 'localhost'),
+      username: ENV.fetch("MYSQL_USER", "active_record_union"),
+      password: ENV.fetch("MYSQL_PASSWORD", "active_record_union")
     )
     ActiveRecord::Base.connection.recreate_database("test_active_record_union")
     ActiveRecord::Base.establish_connection(
       adapter:  "mysql2",
-      database: "test_active_record_union"
+      host: ENV.fetch('DB_HOST', 'localhost'),
+      username: ENV.fetch("MYSQL_USER", "active_record_union"),
+      password: ENV.fetch("MYSQL_PASSWORD", "active_record_union"),
+      database: ENV.fetch("MYSQL_DB", "test_active_record_union")
     )
     load("support/models.rb")
   end

data/spec/union_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ActiveRecord::Relation do
   TIME     = Time.utc(2014, 7, 19, 0, 0, 0)
-  SQL_TIME = ActiveRecord::VERSION::MAJOR >= 5 ? "2014-07-19 00:00:00" : "2014-07-19 00:00:00.000000"
+  SQL_TIME = "2014-07-19 00:00:00"
 
   describe ".union" do
     it "returns an ActiveRecord::Relation" do
@@ -34,18 +34,30 @@ describe ActiveRecord::Relation do
       expect(union.to_sql.squish).to eq(
         "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '#{SQL_TIME}') ) \"posts\""
       )
-      expect(union.arel.to_sql.squish).to eq(
-        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = ? UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '#{SQL_TIME}') ) \"posts\""
-      )
-      expect{union.to_a}.to_not raise_error
+      if ActiveRecord.version >= Gem::Version.new("7.2.0")
+        expect(union.arel.to_sql.squish).to eq(
+          "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = ? UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > ?) ) \"posts\""
+        )
+        expect(bind_values_from_arel(union.arel, Post.arel_table)).to eq([1, TIME])
+      else
+        expect(union.arel.to_sql.squish).to eq(
+          "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = ? UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '#{SQL_TIME}') ) \"posts\""
+        )
+        expect(bind_values_from_arel(union.arel, Post.arel_table)).to eq([1])
+      end
+      expect { union.to_a }.to_not raise_error
     end
 
     def bind_values_from_relation(relation)
-      if ActiveRecord::VERSION::MAJOR >= 5
-        relation.bound_attributes.map { |a| a.value_for_database }
-      else
-        (relation.arel.bind_values + relation.bind_values).map { |_column, value| value }
-      end
+      bind_values_from_arel(relation.arel, relation.arel_table)
+    end
+
+    def bind_values_from_arel(arel, arel_table)
+      collector = Arel::Collectors::Bind.new
+      collector.define_singleton_method(:preparable=) { |_preparable| } if ActiveRecord.version.between?(Gem::Version.new("6.1.0"), Gem::Version.new("7.2.99"))
+      arel_table.class.engine.connection.visitor.accept(
+        arel.ast, collector
+      ).value.map { |v| v.try(:value) || v }
     end
 
     it "binds values properly" do
@@ -68,16 +80,16 @@ describe ActiveRecord::Relation do
       bind_values = bind_values_from_relation union
       expect(bind_values).to eq([true, 11])
 
-
       expect(union.to_sql.squish).to eq(
-        "SELECT \"users\".* FROM ( SELECT \"users\".* FROM \"users\" INNER JOIN \"posts\" ON \"posts\".\"user_id\" = \"users\".\"id\" AND \"posts\".\"draft\" = 't' UNION SELECT \"users\".* FROM \"users\" WHERE \"users\".\"id\" = 11 ) \"users\""
+        "SELECT \"users\".* FROM ( SELECT \"users\".* FROM \"users\" INNER JOIN \"posts\" ON \"posts\".\"draft\" = 1 AND \"posts\".\"user_id\" = \"users\".\"id\" UNION SELECT \"users\".* FROM \"users\" WHERE \"users\".\"id\" = 11 ) \"users\""
       )
       expect{union.to_a}.to_not raise_error
     end
 
     it "doesn't repeat default scopes" do
       expect(Time).to receive(:now) { Time.utc(2014, 7, 24, 0, 0, 0) }
-      sql_now = "2014-07-24 00:00:00#{".000000" if ActiveRecord::VERSION::MAJOR < 5}"
+
+      sql_now = "2014-07-24 00:00:00"
 
       class PublishedPost < ActiveRecord::Base
         self.table_name = "posts"
@@ -101,9 +113,15 @@ describe ActiveRecord::Relation do
 
       context "in SQLite" do
         it "lets ORDER BY in query subselects throw a syntax error" do
-          expect(union.to_sql.squish).to eq(
-            "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ORDER BY \"posts\".\"created_at\" ASC UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '#{SQL_TIME}') ORDER BY \"posts\".\"created_at\" ASC ) \"posts\" ORDER BY \"posts\".\"created_at\" ASC"
-          )
+          if ActiveRecord.version >= Gem::Version.new("7.2.0")
+            expect(union.to_sql.squish).to eq(
+              "SELECT \"posts\".* FROM ( (SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ORDER BY \"posts\".\"created_at\" ASC) UNION (SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00') ORDER BY \"posts\".\"created_at\" ASC) ) \"posts\" ORDER BY \"created_at\" ASC"
+            )
+          else
+            expect(union.to_sql.squish).to eq(
+              "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ORDER BY \"posts\".\"created_at\" ASC UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00') ORDER BY \"posts\".\"created_at\" ASC ) \"posts\" ORDER BY \"created_at\" ASC"
+            )
+          end
           expect{union.to_a}.to raise_error(ActiveRecord::StatementInvalid)
         end
       end
@@ -112,8 +130,9 @@ describe ActiveRecord::Relation do
         it "wraps query subselects in parentheses to allow ORDER BY clauses" do
           Databases.with_postgres do
             expect(union.to_sql.squish).to eq(
-              "SELECT \"posts\".* FROM ( (SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ORDER BY \"posts\".\"created_at\" ASC) UNION (SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '#{SQL_TIME}') ORDER BY \"posts\".\"created_at\" ASC) ) \"posts\" ORDER BY \"posts\".\"created_at\" ASC"
+              "SELECT \"posts\".* FROM ( (SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ORDER BY \"posts\".\"created_at\" ASC) UNION (SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00') ORDER BY \"posts\".\"created_at\" ASC) ) \"posts\" ORDER BY \"created_at\" ASC"
             )
+
             expect{union.to_a}.to_not raise_error
           end
         end
@@ -123,8 +142,9 @@ describe ActiveRecord::Relation do
         it "wraps query subselects in parentheses to allow ORDER BY clauses" do
           Databases.with_mysql do
             expect(union.to_sql.squish).to eq(
-              "SELECT `posts`.* FROM ( (SELECT `posts`.* FROM `posts` WHERE `posts`.`user_id` = 1 ORDER BY `posts`.`created_at` ASC) UNION (SELECT `posts`.* FROM `posts` WHERE (created_at > '#{SQL_TIME}') ORDER BY `posts`.`created_at` ASC) ) `posts` ORDER BY `posts`.`created_at` ASC"
+              "SELECT `posts`.* FROM ( (SELECT `posts`.* FROM `posts` WHERE `posts`.`user_id` = 1 ORDER BY `posts`.`created_at` ASC) UNION (SELECT `posts`.* FROM `posts` WHERE (created_at > '2014-07-19 00:00:00') ORDER BY `posts`.`created_at` ASC) ) `posts` ORDER BY `created_at` ASC"
             )
+
             expect{union.to_a}.to_not raise_error
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_union
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Brian Hempel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2025-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,48 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: UNIONs in ActiveRecord! Adds proper union and union_all methods to ActiveRecord::Relation.
 email:
 - plasticchicken@gmail.com
@@ -129,18 +87,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/testing.yml"
 - ".gitignore"
-- ".travis.yml"
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - active_record_union.gemspec
 - bin/console
+- bin/create-db-users
 - lib/active_record_union.rb
 - lib/active_record_union/active_record/relation/union.rb
 - lib/active_record_union/version.rb
-- rails_4_2.gemfile
-- rails_5_0.gemfile
+- rails_6.0.gemfile
+- rails_6.1.gemfile
+- rails_7.0.gemfile
+- rails_7.1.gemfile
+- rails_7.2.gemfile
+- rails_8.0.gemfile
 - spec/spec_helper.rb
 - spec/support/databases.rb
 - spec/support/models.rb
@@ -149,7 +113,7 @@ homepage: https://github.com/brianhempel/active_record_union
 licenses:
 - Public Domain
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: UNIONs in ActiveRecord! Adds proper union and union_all methods to ActiveRecord::Relation.
 test_files:
@@ -175,3 +138,4 @@ test_files:
 - spec/support/models.rb
 - spec/union_spec.rb
 - bin/console
+- bin/create-db-users

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-addons:
-  postgresql: "9.4"
-rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.8
-  - 2.0.0
-gemfile:
-  - rails_4_2.gemfile
-  - rails_5_0.gemfile
-matrix:
-  exclude:
-  # Rails 5 requires Ruby 2.2+:
-  - rvm: 2.1.8
-    gemfile: rails_5_0.gemfile
-  - rvm: 2.0.0
-    gemfile: rails_5_0.gemfile
-script: bundle exec rspec

data/rails_4_2.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_record_union.gemspec
-gemspec
-
-gem 'rails', '~> 4.2.6'

data/rails_5_0.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_record_union.gemspec
-gemspec
-
-gem 'rails', ['>= 5.0.0.rc2', '< 5.1']