extended_joins_impl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 176175342f56543e6c120a7ffe6cd20b724ce18c
-  data.tar.gz: 1f3e8e7cbef0d065be7270ebd15a8dcdd2972c61
+  metadata.gz: 2dce719cbfac8324b50d1cfb1b6435cdcc6b9743
+  data.tar.gz: 8dc129e90dd5c86ea54535532208e6c9ebbd2180
 SHA512:
-  metadata.gz: 4fe86f47f07af0f4adf566a57ae616235aae29f135cd220443eca8c24ddab12d71ebddfa123b72ef7ed983d4e437eb147f104c2b0bc90fd5af0ca89764d822f6
-  data.tar.gz: 2614a5e9d6c9f9f8c7f94d2d9593ef7e16b447af0d3e61ed1bdf4ac412302559f343b4b963334112c4a2248ff6e00599b5c8b34cdef07a5570bb834071312c89
+  metadata.gz: 14c06ab1463e761a0aa2c828ba40428e480e10a21a7ecb089f6348fee60076a17b1945c08d203e35abb7e03a811636fb416304004127043da46500d954b9157b
+  data.tar.gz: c621f70223f86459eb38bf0ec77ba26e027f04d947aa6f85c8cdeb2389765ab3a4892e7d6281eaa698d6db27b46bcfa1e28770e262d7564f3a68ba2f68dea584

data/lib/extended_joins_impl/version.rb

@@ -1,3 +1,3 @@
 module ExtendedJoinsImpl
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/extended_joins_impl.rb

@@ -48,7 +48,9 @@ module ExtendedJoinsImpl
 end
 
 module ActiveRecord
-  class Relation
-    include ExtendedJoinsImpl
+  class Base
+    class << self
+      include ExtendedJoinsImpl
+    end
   end
 end

data/spec/extended_joins_impl_spec.rb

@@ -5,39 +5,55 @@ require 'extended_joins_impl'
 describe ExtendedJoinsImpl do
 
   it "inner join" do
-    sql = User.where(nil).extended_joins(:inner, Type.where(nil)).to_sql
+    sql = if ActiveRecord::VERSION::MAJOR >= 4
+            User.extended_joins(:inner, Type.all).to_sql
+          else
+            User.extended_joins(:inner, Type.scoped).to_sql
+          end
     expect(sql).to include "INNER JOIN"
     expect(sql).to include "\"users\".\"type_id\" = types.\"id\""
   end
 
   it "left outer join" do
-    sql = User.where(nil).extended_joins(:outer, Type.where(nil)).to_sql
+    sql = if ActiveRecord::VERSION::MAJOR >= 4
+            User.extended_joins(:outer, Type.all).to_sql
+          else
+            User.extended_joins(:outer, Type.scoped).to_sql
+          end
     expect(sql).to include "LEFT OUTER JOIN"
     expect(sql).to include "\"users\".\"type_id\" = types.\"id\""
   end
 
   it "subquery join" do
-    sql = User.where(nil).extended_joins(:outer, Type.where(id: 3)).to_sql
+    sql = User.extended_joins(:outer, Type.where(id: 3)).to_sql
     expect(sql).to include "LEFT OUTER JOIN"
     expect(sql).to include "\"users\".\"type_id\" = types.\"id\""
     expect(sql).to include "WHERE \"types\".\"id\" = 3"
   end
 
   it "join alias" do
-    sql = User.where(nil).extended_joins(:outer, Type.where(id: 3), as: "user_types").to_sql
+    sql = User.extended_joins(:outer, Type.where(id: 3), as: "user_types").to_sql
     expect(sql).to include "LEFT OUTER JOIN"
     expect(sql).to include "\"users\".\"type_id\" = user_types.\"id\""
     expect(sql).to include "WHERE \"types\".\"id\" = 3"
   end
 
   it "join on condition" do
-    sql = User.where(nil).extended_joins(:inner, Note.where(nil), on: {code: :user_code}).to_sql
+    sql = if ActiveRecord::VERSION::MAJOR >= 4
+            User.extended_joins(:inner, Note.all, on: {code: :user_code}).to_sql
+          else
+            User.extended_joins(:inner, Note.scoped, on: {code: :user_code}).to_sql
+          end
     expect(sql).to include "INNER JOIN"
     expect(sql).to include "\"users\".\"code\" = notes.\"user_code\""
   end
 
   it "join on constant" do
-    sql = User.where(nil).extended_joins(:inner, Note.where(nil), where: {id: 3, user_code: 4}).to_sql
+    sql = if ActiveRecord::VERSION::MAJOR >= 4
+            User.extended_joins(:inner, Note.all, where: {id: 3, user_code: 4}).to_sql
+          else
+            User.extended_joins(:inner, Note.scoped, where: {id: 3, user_code: 4}).to_sql
+          end
     expect(sql).to include "INNER JOIN"
     expect(sql).to include "\"users\".\"id\" = notes.\"user_id\""
     expect(sql).to include "notes.\"id\" = 3"
@@ -45,7 +61,11 @@ describe ExtendedJoinsImpl do
   end
 
   it "join with association" do
-    sql = User.where(nil).extended_joins(:inner, Note.where(nil), as: "user_notes").to_sql
+    sql = if ActiveRecord::VERSION::MAJOR >= 4
+            User.extended_joins(:inner, Note.all, as: "user_notes").to_sql
+          else
+            User.extended_joins(:inner, Note.scoped, as: "user_notes").to_sql
+          end
     expect(sql).to include "INNER JOIN"
     expect(sql).to include "\"users\".\"code\" = user_notes.\"user_code\""
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extended_joins_impl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - MnrUchida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler