active_record_union 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e5aaf90d66c3e15eb7e2c225283b0c2790b146b
-  data.tar.gz: fb36ac1c86da58e19de86409e9bd3c35897e247f
+  metadata.gz: ae20ef21309b30f9193146326e3eaeace7cd5c51
+  data.tar.gz: a90fc0e536026c8d797624101090c8c91c8b9b73
 SHA512:
-  metadata.gz: 3b0140dffec59d1214dc18c456dad0ff28c24f1262704ab7628af0f679dc08c5e30d9d8effcbff29fa4f6800894579b82f2663d15a1341b895512546f366c109
-  data.tar.gz: 9683ecd6bd506d3226a04ddb3abcd461a7a3adb0088d0f577069569965bac460480bf35f5dd26fcf966779a24a0f1cb32cf531e5c8600dea86769ec540416c26
+  metadata.gz: 5559877947d4d9b10a37474235c2911de70c1273cc68a7bfadeea62f1f8f1477e131784752fa85bb6b9dca9cb056ff9ea059cad6477eed6316e9415731307074
+  data.tar.gz: 6c093a61bb9f60dc50129d0dce5a9ca83bf634471c1af8b9bba777ef1fdfb827eeddc436da14cddbaeca3720cebd1666261d48233fd063877a0dd191d1c35787

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 addons:
-  postgresql: "9.3"
-before_script:
-  - psql -c 'create database travis;' -U postgres # "travis" is the UNIX username, and therefore the default database name on connection
+  postgresql: "9.4"
 rvm:
-  - 2.1.2
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
   - 2.0.0

data/README.md

@@ -7,6 +7,16 @@ Use unions on ActiveRecord scopes without ugliness.
 
 If you find yourself writing `pluck(:id)` and then feeding that into another query, you may be able to reduce the number of database requests by using a nested query or a UNION without writing crazy JOIN statements.
 
+Quick usage examples:
+
+```ruby
+current_user.posts.union(Post.published)
+current_user.posts.union(Post.published).where(id: [6, 7])
+current_user.posts.union("published_at < ?", Time.now)
+user_1.posts.union(user_2.posts).union(Post.published)
+user_1.posts.union_all(user_2.posts)
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -174,6 +184,10 @@ This is a gem not a Rails pull request because the standard of code quality for
 
 ## Changelog
 
+**1.1.1** - Mar 19, 2016
+  - Fix broken polymorphic associations and joins due to improper handling of bind values. Fix by [@efradelos](https://github.com/efradelos), reported by [@Machiaweliczny](https://github.com/Machiaweliczny).
+  - Quote table name aliases properly. Reported by [@odedniv](https://github.com/odedniv).
+
 **1.1.0** - Mar 29, 2015 - Add UNION ALL support, courtesy of [@pic](https://github.com/pic).
 
 **1.0.1** - Sept 2, 2014 - Allow ORDER BY in UNION subselects for databases that support it (not SQLite).

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

@@ -3,16 +3,16 @@ module ActiveRecord
     module Union
 
       SET_OPERATION_TO_AREL_CLASS = {
-        "UNION"     => Arel::Nodes::Union,
-        "UNION ALL" => Arel::Nodes::UnionAll
+        union:     Arel::Nodes::Union,
+        union_all: Arel::Nodes::UnionAll
       }
 
       def  union(relation_or_where_arg, *args)
-        set_operation("UNION", relation_or_where_arg, *args)
+        set_operation(:union, relation_or_where_arg, *args)
       end
 
       def  union_all(relation_or_where_arg, *args)
-        set_operation("UNION ALL", relation_or_where_arg, *args)
+        set_operation(:union_all, relation_or_where_arg, *args)
       end
 
       private
@@ -37,11 +37,11 @@ module ActiveRecord
         set = SET_OPERATION_TO_AREL_CLASS[operation].new(left, right)
         from = Arel::Nodes::TableAlias.new(
           set,
-          Arel::Nodes::SqlLiteral.new(@klass.arel_table.name)
+          @klass.arel_table.name
         )
 
         relation = @klass.unscoped.from(from)
-        relation.bind_values = self.bind_values + other.bind_values
+        relation.bind_values = self.arel.bind_values + self.bind_values + other.arel.bind_values + other.bind_values
         relation
       end
 

data/lib/active_record_union/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUnion
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/support/databases.rb

@@ -35,12 +35,14 @@ module Databases
 
   def with_postgres(&block)
     connect_to_postgres
+    yield
   ensure
     connect_to_sqlite
   end
 
   def with_mysql(&block)
     connect_to_mysql
+    yield
   ensure
     connect_to_sqlite
   end

data/spec/support/models.rb

@@ -3,10 +3,12 @@ end
 
 class User < ActiveRecord::Base
   has_many :posts
+  has_many :drafts, -> { where draft: true  }, class_name: "Post"
 end unless defined?(User)
 
 ActiveRecord::Base.connection.create_table :posts, force: true do |t|
   t.integer   :user_id
+  t.boolean   :draft
   t.timestamp :published_at
   t.timestamps null: false
 end

data/spec/union_spec.rb

@@ -29,10 +29,10 @@ describe ActiveRecord::Relation do
       union = User.new(id: 1).posts.union(Post.where("created_at > ?", Time.utc(2014, 7, 19, 0, 0, 0)))
 
       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 > '2014-07-19 00:00:00.000000') ) posts"
+        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00.000000') ) \"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 > '2014-07-19 00:00:00.000000') ) posts"
+        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = ? UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00.000000') ) \"posts\""
       )
       expect{union.to_a}.to_not raise_error
     end
@@ -43,11 +43,27 @@ describe ActiveRecord::Relation do
       user3 = User.new(id: 3)
 
       union = user1.posts.union(user2.posts).where.not(id: user3.posts)
-      bind_values = union.bind_values.map { |column, value| value }
+
+      # Inside ActiveRecord the bind value list is
+      # (union.arel.bind_values + union.bind_values)
+      bind_values = (union.arel.bind_values + union.bind_values).map { |column, value| value }
 
       expect(bind_values).to eq([1, 2, 3])
     end
 
+    it "binds values properly on joins" do
+      union = User.joins(:drafts).union(User.where(id: 11))
+
+      bind_values = (union.arel.bind_values + union.bind_values).map { |column, value| value }
+      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\""
+      )
+      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) }
 
@@ -59,7 +75,7 @@ describe ActiveRecord::Relation do
       union = PublishedPost.where("created_at > ?", Time.utc(2014, 7, 19, 0, 0, 0)).union(User.new(id: 1).posts)
 
       expect(union.to_sql.squish).to eq(
-        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE (published_at < '2014-07-24 00:00:00.000000') AND (created_at > '2014-07-19 00:00:00.000000') UNION SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ) posts"
+        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE (published_at < '2014-07-24 00:00:00.000000') AND (created_at > '2014-07-19 00:00:00.000000') UNION SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 ) \"posts\""
       )
       expect{union.to_a}.to_not raise_error
     end
@@ -74,7 +90,7 @@ 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 > '2014-07-19 00:00:00.000000') 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.000000') ORDER BY \"posts\".\"created_at\" ASC ) \"posts\" ORDER BY \"posts\".\"created_at\" ASC"
           )
           expect{union.to_a}.to raise_error(ActiveRecord::StatementInvalid)
         end
@@ -84,7 +100,7 @@ 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 > '2014-07-19 00:00:00.000000') 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.000000') ORDER BY \"posts\".\"created_at\" ASC) ) \"posts\" ORDER BY \"posts\".\"created_at\" ASC"
             )
             expect{union.to_a}.to_not raise_error
           end
@@ -95,7 +111,7 @@ 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 > '2014-07-19 00:00:00.000000')  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.000000') ORDER BY `posts`.`created_at` ASC) ) `posts` ORDER BY `posts`.`created_at` ASC"
             )
             expect{union.to_a}.to_not raise_error
           end
@@ -108,24 +124,27 @@ describe ActiveRecord::Relation do
         union = User.new(id: 1).posts.union(id: 2)
 
         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 \"posts\".\"id\" = 2 ) posts"
+          "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"id\" = 2 ) \"posts\""
         )
+        expect{union.to_a}.to_not raise_error
       end
 
       it "multiple arguments" do
         union = User.new(id: 1).posts.union("created_at > ?", Time.utc(2014, 7, 19, 0, 0, 0))
 
         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 > '2014-07-19 00:00:00.000000') ) posts"
+          "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00.000000') ) \"posts\""
         )
+        expect{union.to_a}.to_not raise_error
       end
 
       it "arel" do
         union = User.new(id: 1).posts.union(Post.arel_table[:id].eq(2).or(Post.arel_table[:id].eq(3)))
 
         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 (\"posts\".\"id\" = 2 OR \"posts\".\"id\" = 3) ) posts"
+          "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION SELECT \"posts\".* FROM \"posts\" WHERE (\"posts\".\"id\" = 2 OR \"posts\".\"id\" = 3) ) \"posts\""
         )
+        expect{union.to_a}.to_not raise_error
       end
     end
   end
@@ -135,7 +154,7 @@ describe ActiveRecord::Relation do
       union = User.new(id: 1).posts.union_all(Post.where("created_at > ?", Time.utc(2014, 7, 19, 0, 0, 0)))
 
       expect(union.to_sql.squish).to eq(
-        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION ALL SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00.000000') ) posts"
+        "SELECT \"posts\".* FROM ( SELECT \"posts\".* FROM \"posts\" WHERE \"posts\".\"user_id\" = 1 UNION ALL SELECT \"posts\".* FROM \"posts\" WHERE (created_at > '2014-07-19 00:00:00.000000') ) \"posts\""
       )
       expect{union.to_a}.to_not raise_error
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_union
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Hempel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: UNIONs in ActiveRecord! Adds proper union and union_all methods to ActiveRecord::Relation.