ActiveRecord::Relation#primary_key should return a string, just like ActiveRecord::Base.primary_key does.

Let AssociationCollection#find use #scoped to do its finding. Note that I am removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences.

Fix test_any in relations_test.rb, which was failing when relations_test.rb is run on its own (it passes when the entire suite is run). This is a hacky fix for a problem I didn't quite get to the bottom of, so I'd welcome a better solution...

* rename method names (actually in tests)
* rename instance variable @_named_scopes_cache to @_scopes_cache
* rename references in doc comments
* don't touch CHANGELOG :)

[#6022 state:resolved]

When use where more than once on the same column, relation doesn't do an 'or' or 'in' with the values

- persisted? is the API defined in ActiveModel
- makes it easier for extension libraries to conform to ActiveModel APIs
  without concern for whether the extended object is specifically
  ActiveRecord

[#5927 state:committed]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

use column names as order by complex function parameters, fix for postgresql adapter to correctly remove ASC/DESC
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Fixes queries using limits and punctuation in order, removes order("col1, col2") usage in favor of order(["col1", "col2"})

[#4597 state:committed]

while declaring default_scope

Also added test for unscoped using block style with four different
combinations
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

added a test for relation which checks intersection between a relation and an array works in both directions
Signed-off-by: NMikel Lindsaar <raasdnil@gmail.com>

order that is declared first has highest priority in all cases.

Here are some examples.

Car.order('name desc').find(:first, :order => 'id').name

Car.named_scope_with_order.named_scope_with_another_order

Car.order('id DESC').scoping do
  Car.find(:first, :order => 'id asc')
end

No special treatment to with_scope or scoping.

Also note that if default_scope declares an order then the order
declared in default_scope has the highest priority unless
with_exclusive_scope is used.
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

code gardening: we have assert_(nil|blank|present), more concise, with better default failure messages - let's use them

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#5153 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>