Merge branch 'fix_specs_to_fit_lastest_rails_updates'

Author: bigxiang

README.md

@@ -86,24 +86,6 @@ A Squeel keypath is essentially a more concise and readable alternative to a
 deeply nested hash. For instance, in standard Active Record, you might join several
 associations like this to perform a query:
 
-#### Rails 4+
-
-```ruby
-Person.joins(:articles => {:comments => :person}).references(:all)
-# => SELECT "people".* FROM "people"
-#    LEFT OUTER JOIN "articles" ON "articles"."person_id" = "people"."id"
-#    LEFT OUTER JOIN "comments" ON "comments"."article_id" = "articles"."id"
-#    LEFT OUTER JOIN "people" "people_comments" ON "people_comments"."id" = "comments"."person_id"
-```
-
-With a keypath, this would look like:
-
-```ruby
-Person.joins{articles.comments.person}.references(:all)
-```
-
-#### Rails 3.x
-
 ```ruby
 Person.joins(:articles => {:comments => :person})
 # => SELECT "people".* FROM "people"
@@ -452,6 +434,43 @@ Seat.joins { [payment.outer, subquery.as('seat_order_items').on { id == seat_ord
 #    ) seat_order_items ON "seats"."id" = "seat_order_items"."orderable_id"
 ```
 
+### Includes
+
+Includes works similarly with joins, it uses outer join defaultly. In Rails 4,
+you need to use `references` with `includes` together.
+
+#### Rails 4+
+
+```ruby
+Person.includes(:articles => {:comments => :person}).references(:all)
+# => SELECT "people".* FROM "people"
+#    LEFT OUTER JOIN "articles" ON "articles"."person_id" = "people"."id"
+#    LEFT OUTER JOIN "comments" ON "comments"."article_id" = "articles"."id"
+#    LEFT OUTER JOIN "people" "people_comments" ON "people_comments"."id" = "comments"."person_id"
+```
+
+With a keypath, this would look like:
+
+```ruby
+Person.includes{articles.comments.person}.references(:all)
+```
+
+#### Rails 3.x
+
+```ruby
+Person.includes(:articles => {:comments => :person})
+# => SELECT "people".* FROM "people"
+#    LEFT OUTER JOIN "articles" ON "articles"."person_id" = "people"."id"
+#    LEFT OUTER JOIN "comments" ON "comments"."article_id" = "articles"."id"
+#    LEFT OUTER JOIN "people" "people_comments" ON "people_comments"."id" = "comments"."person_id"
+```
+
+With a keypath, this would look like:
+
+```ruby
+Person.includes{articles.comments.person}
+```
+
 ### Functions
 
 You can call SQL functions just like you would call a method in Ruby...

spec/spec_helper.rb

@@ -1,6 +1,8 @@
+require 'pry'
 require 'faker'
 require 'active_record'
 require 'active_support'
+require 'active_support/core_ext/string'
 
 module ActiveRecord
   # Shamelessly swiped from the AR test code

spec/squeel/adapters/active_record/relation_extensions_spec.rb

@@ -686,12 +686,44 @@ module ActiveRecord
 
           it 'uses Squeel and Arel at the same time' do
             relation = User.where{id.in([1,2,3]) & User.arel_table[:id].not_eq(nil) }
-            relation.to_sql.should match /SELECT #{Q}users#{Q}.\* FROM #{Q}users#{Q}\s+WHERE \(\(#{Q}users#{Q}.#{Q}id#{Q} IN \(1, 2, 3\) AND #{Q}users#{Q}.#{Q}id#{Q} IS NOT NULL\)\)/
-            relation = User.where{
-              (id.in([1,2,3]) | User.arel_table[:id].eq(1)) & ((id == 1) | User.arel_table[:id].not_eq(nil)) }
-            relation.to_sql.should match /SELECT #{Q}users#{Q}.\* FROM #{Q}users#{Q}\s+WHERE \(\(\(#{Q}users#{Q}.#{Q}id#{Q} IN \(1, 2, 3\) OR #{Q}users#{Q}.#{Q}id#{Q} = 1\) AND \(#{Q}users#{Q}.#{Q}id#{Q} = 1 OR #{Q}users#{Q}.#{Q}id#{Q} IS NOT NULL\)\)\)/
+
+            if activerecord_version_at_least '4.2.0'
+              relation.to_sql.should eq "
+                SELECT #{Q}users#{Q}.* FROM #{Q}users#{Q}
+                WHERE (#{Q}users#{Q}.#{Q}id#{Q} IN (1, 2, 3)
+                AND #{Q}users#{Q}.#{Q}id#{Q} IS NOT NULL)
+              ".squish
+            else
+              relation.to_sql.should match /SELECT #{Q}users#{Q}.\* FROM #{Q}users#{Q}\s+WHERE \(\(#{Q}users#{Q}.#{Q}id#{Q} IN \(1, 2, 3\) AND #{Q}users#{Q}.#{Q}id#{Q} IS NOT NULL\)\)/
+            end
+
+            relation = User.where {
+              (id.in([1,2,3]) | User.arel_table[:id].eq(1)) &
+              ((id == 1) | User.arel_table[:id].not_eq(nil)) }
+
+            if activerecord_version_at_least '4.2.0'
+              relation.to_sql.should eq "
+                SELECT #{Q}users#{Q}.*
+                FROM #{Q}users#{Q}
+                WHERE ((#{Q}users#{Q}.#{Q}id#{Q} IN (1, 2, 3) OR #{Q}users#{Q}.#{Q}id#{Q} = 1)
+                AND (#{Q}users#{Q}.#{Q}id#{Q} = 1 OR #{Q}users#{Q}.#{Q}id#{Q} IS NOT NULL))
+              ".squish
+            else
+              relation.to_sql.should match /SELECT #{Q}users#{Q}.\* FROM #{Q}users#{Q}\s+WHERE \(\(\(#{Q}users#{Q}.#{Q}id#{Q} IN \(1, 2, 3\) OR #{Q}users#{Q}.#{Q}id#{Q} = 1\) AND \(#{Q}users#{Q}.#{Q}id#{Q} = 1 OR #{Q}users#{Q}.#{Q}id#{Q} IS NOT NULL\)\)\)/
+            end
           end
 
+          it "large than & less than" do
+            if activerecord_version_at_least '4.1.0'
+              relation = User.where { created_at <= 1.hours.ago }
+              expect { relation.to_sql }.not_to raise_error
+
+              relation = User.where { created_at < 1.hours.ago }
+              expect { relation.to_sql }.not_to raise_error
+            else
+              pending 'Unsupported under Rails 4.1'
+            end
+          end
         end
 
         describe '#joins' do
@@ -745,7 +777,14 @@ module ActiveRecord
           it 'validates polymorphic relationship with source type' do
             if activerecord_version_at_least('4.0.0')
               relation = Group.joins{users}
-              relation.to_sql.should match /#{Q}memberships#{Q}.#{Q}active#{Q} = ['1t']{1,3} AND #{Q}memberships#{Q}.#{Q}member_type#{Q} = 'User'/
+
+              if MYSQL_ENV
+                relation.to_sql.should match /#{Q}memberships#{Q}.#{Q}active#{Q} = 1/
+              else
+                relation.to_sql.should match /#{Q}memberships#{Q}.#{Q}active#{Q} = 't'/
+              end
+
+              relation.to_sql.should match /#{Q}memberships#{Q}.#{Q}member_type#{Q} = 'User'/
               relation.to_sql.should match /INNER JOIN #{Q}users#{Q} ON #{Q}users#{Q}.#{Q}id#{Q} = #{Q}memberships#{Q}.#{Q}member_id#{Q}/
               relation.to_sql.should match /INNER JOIN #{Q}memberships#{Q} ON #{Q}memberships#{Q}.#{Q}group_id#{Q} = #{Q}groups#{Q}.#{Q}id#{Q}/
             elsif activerecord_version_at_least('3.2.7')
@@ -778,11 +817,27 @@ module ActiveRecord
               else
                 User.first.groups.to_sql.should match /#{Q}memberships#{Q}.#{Q}active#{Q} = 't'/
               end
-
             else
               pending "Rails 3.0.x doesn't support to_sql in an association."
             end
           end
+
+          it 'default scopes with multiple wheres' do
+            if activerecord_version_at_least('4.0.0')
+              relation = Dept.joins { people_named_bill_with_low_salary }
+
+              relation.to_sql.should eq "
+                  SELECT #{Q}depts#{Q}.*
+                  FROM #{Q}depts#{Q}
+                  INNER JOIN #{Q}people#{Q} ON
+                    #{Q}people#{Q}.#{Q}dept_id#{Q} = #{Q}depts#{Q}.#{Q}id#{Q} AND
+                    #{Q}people#{Q}.#{Q}name#{Q} = 'Bill' AND
+                    #{Q}people#{Q}.#{Q}salary#{Q} < 20000
+                ".squish
+            else
+              pending "Rails 3.x doesn't support default scope in joins"
+            end
+          end
         end
 
         describe '#having' do

spec/support/models.rb

@@ -1,4 +1,5 @@
 class Person < ActiveRecord::Base
+  belongs_to :dept
   belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :articles
@@ -58,6 +59,19 @@ class PersonNamedBill < ActiveRecord::Base
   scope :with_salary_equal_to, lambda { |value| where{abs(salary) == value} }
 end
 
+class Dept < ActiveRecord::Base
+  has_many :people_named_bill_with_low_salary,
+    class_name: 'PersonNamedBillAndLowSalary', foreign_key: 'dept_id'
+end
+
+class PersonNamedBillAndLowSalary < Person
+  if ActiveRecord::VERSION::MAJOR > 3 || ActiveRecord::VERSION::MINOR > 0
+    default_scope { where { name == 'Bill' }.where { salary < 20000 } }
+  else # 3.0 doesn't support callables for default_scope
+    default_scope where { name == 'Bill' }.where { salary < 20000 }
+  end
+end
+
 class Message < ActiveRecord::Base
   belongs_to :author, :class_name => 'Person'
   belongs_to :recipient, :class_name => 'Person'
@@ -145,9 +159,14 @@ class Payment < ActiveRecord::Base
 
 class Models
   def self.make
+    dept = Dept.create(name: Faker::Lorem.name)
+
     10.times do |i|
       # 10 people total, salary gt 30000
-      person = Person.create(name: Faker::Name.name, salary: 30000 + (i + 1) * 1000)
+      person = Person.create(name: Faker::Name.name,
+        salary: 30000 + (i + 1) * 1000,
+        dept: dept)
+
       2.times do
         # 20 unidentified object total, 2 per person
         person.unidentified_objects.create(name: Faker::Lorem.words(1).first)

spec/support/schema.rb

@@ -79,10 +79,15 @@ def rebuild_postgresql_db
   ActiveRecord::Migration.verbose = false
 
   ActiveRecord::Schema.define do
+    create_table :depts, :force => true do |t|
+      t.string :name
+    end
+
     create_table :people, :force => true do |t|
       t.integer  :parent_id
       t.string   :name
       t.integer  :salary
+      t.integer  :dept_id
     end
 
     create_table :messages, :force => true do |t|

squeel.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mysql', '~> 2.9.1'
   s.add_development_dependency 'mysql2', '~> 0.3.16'
   s.add_development_dependency 'pg', '~> 0.17.1'
+  s.add_development_dependency 'git_pretty_accept', '~> 0.4.0'
+  s.add_development_dependency 'pry'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")