active_record_union 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc119e16853585b8595e9c7cf0de7b1282f30411
-  data.tar.gz: eea98a19c016f681636e982ffffb9180e3876e4c
+  metadata.gz: 3b6908e8b32e304532e3b8405712ade67fab7e52
+  data.tar.gz: 937298c6d470715b18510f2e317a7f3d735b2cf6
 SHA512:
-  metadata.gz: efa7fa3f32874d1052bf39f54b4e80e9135980bee70604bf18d12759ba42a5a8ca653427d78ea4ebb9ac6081654a91488ee6758c443d80f7e454061576b7d9f5
-  data.tar.gz: db0f08034881ebe394d656b3b6f997719aaff48dcc979602ca68d8202454182583d50761e725de811bc35e23b5fcf66286947d868bcf1d14dbb103b22ca0ea65
+  metadata.gz: 8466c15bb3c268bbea28f49b3a85915e91f72bd43997462a4bd09a1da14ec9c85d5ca9621a6b7316ac04fe6949ccf4284bce854ed5b33c71bc492ca9bbd0cc9f
+  data.tar.gz: a99a9d9c0c19e332d9b0c357310d886c72c5b7f629be97a0d8e2dcdc8d90dcb1605960f3a44a8dacdfe0749dc7dfe6f2571ebe27d63a6bcb1970e7798447a88f

data/.travis.yml

@@ -2,18 +2,10 @@ language: ruby
 addons:
   postgresql: "9.4"
 rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.8
-  - 2.0.0
+  - 2.3.6
 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
+  - rails_5_1.gemfile
+  - rails_5_2.gemfile
 script: bundle exec rspec

data/README.md

@@ -17,6 +17,8 @@ user_1.posts.union(user_2.posts).union(Post.published)
 user_1.posts.union_all(user_2.posts)
 ```
 
+ActiveRecordUnion is tested against Rails 4.2 and Rails 5.0. It may or may not work on Rails 4.0/4.1.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -127,7 +129,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 +186,9 @@ This is a gem not a Rails pull request because the standard of code quality for
 
 ## Changelog
 
+**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 +214,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. From a vanilla install of MariaDB from Homebrew, this just works. For Postgres installed by Homebrew, you may need to run `$ echo "create database my_computer_user_name;" | psql postgres` since the initial database created by Homebrew is named "postgres" but PG defaults to connecting to a database named after your username.
+  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_4_2` or `rake test_rails_5_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/lib/active_record_union/active_record/relation/union.rb

@@ -18,7 +18,7 @@ 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)
@@ -26,24 +26,56 @@ module ActiveRecord
 
         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
+        build_union_relation(from, other)
+      end
+
+      if ActiveRecord.gem_version >= Gem::Version.new('5.2.0.beta2')
+        # Since Rails 5.2, binds are maintained only in the Arel AST.
+        def build_union_relation(arel_table_alias, _other)
+          @klass.unscoped.from(arel_table_alias)
+        end
+      elsif ActiveRecord::VERSION::MAJOR >= 5
+        # In Rails >= 5.0, < 5.2, binds are maintained only in ActiveRecord
+        # relations and clauses.
+        def build_union_relation(arel_table_alias, other)
+          relation = @klass.unscoped.spawn
+          relation.from_clause =
+            UnionFromClause.new(arel_table_alias, nil,
+                                self.bound_attributes + other.bound_attributes)
+          relation
+        end
+
+        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
+      else
+        # In Rails 4.x, binds are maintained in both ActiveRecord relations and
+        # clauses and also in their Arel ASTs.
+        def build_union_relation(arel_table_alias, other)
+          relation = @klass.unscoped.from(arel_table_alias)
+          relation.bind_values = self.arel.bind_values + self.bind_values +
+                                 other.arel.bind_values + other.bind_values
+          relation
         end
-        relation
       end
 
       def verify_relations_for_set_operation!(operation, *relations)
@@ -63,19 +95,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.3.0"
 end

data/rails_4_2.gemfile

@@ -3,4 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_record_union.gemspec
 gemspec
 
-gem 'rails', '~> 4.2.6'
+gem 'rails', '~> 4.2.7'
+
+# On Rails < 5.2, only pg < v1 is supported. See:
+# https://github.com/rails/rails/pull/31671
+# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
+gem 'pg', '~> 0.21'

data/rails_5_0.gemfile

@@ -3,4 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_record_union.gemspec
 gemspec
 
-gem 'rails', ['>= 5.0.0.rc2', '< 5.1']
+gem 'rails', '~> 5.0.0'
+
+# On Rails < 5.2, only pg < v1 is supported. See:
+# https://github.com/rails/rails/pull/31671
+# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
+gem 'pg', '~> 0.21'

data/rails_5_1.gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+gem 'rails', '~> 5.1.0'
+
+# On Rails < 5.2, only pg < v1 is supported. See:
+# https://github.com/rails/rails/pull/31671
+# https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
+gem 'pg', '~> 0.21'

data/rails_5_2.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_union.gemspec
+gemspec
+
+# pg v1.0+ compatibility, https://github.com/rails/rails/pull/31671:
+gem 'rails', '~> 5.2.0.beta2', git: 'https://github.com/rails/rails', ref: 'f1af27fd9d9101684b26d0dcf2028859d67bec1f'

data/spec/union_spec.rb

@@ -41,7 +41,11 @@ describe ActiveRecord::Relation do
     end
 
     def bind_values_from_relation(relation)
-      if ActiveRecord::VERSION::MAJOR >= 5
+      if ActiveRecord.gem_version >= Gem::Version.new('5.2.0.beta2')
+        relation.arel_table.class.engine.connection.visitor.accept(
+          relation.arel.ast, Arel::Collectors::Bind.new
+        ).value.map(&:value)
+      elsif 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 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_union
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Brian Hempel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -141,6 +141,8 @@ files:
 - lib/active_record_union/version.rb
 - rails_4_2.gemfile
 - rails_5_0.gemfile
+- rails_5_1.gemfile
+- rails_5_2.gemfile
 - spec/spec_helper.rb
 - spec/support/databases.rb
 - spec/support/models.rb
@@ -165,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: UNIONs in ActiveRecord! Adds proper union and union_all methods to ActiveRecord::Relation.