See the CHANGELOG for details.

Fixes #950.

This reverts commit c99d507f.

Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.

- If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not.
- When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count.  Looks like it was broken here:
https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265

Fix bug with 0bb85ed9 which missed out a fixtures declaration in cascaded_eager_loading_test.rb

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

[#4597 state:committed]

Update new tests in cascaded_eager_loading_test.rb to work with the modified fixtures in this branch

Fix bug with 0bb85ed9 which missed out a fixtures declaration in cascaded_eager_loading_test.rb

Add some tests for functionality in JoinAssociation which already exists but was previously untested

Refactoring JoinDependency and friends. This improves the code (IMO) including adding some explanatory comments, but more importantly structures it in such a way as to allow a JoinAssociation to produce an arbitrary number of actual joins, which will be necessary for nested has many through support. Also added 3 tests covering functionality which existed but was not previously covered.

Fix the tests (I have actually verified that these are also the 'right' fixes, rather than just making the tests pass again)

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

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

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

[#4679 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#4463 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9084 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

* TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  [Jeremy Kemper]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7460 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

Moved acts_as_tree into a plugin of the same name on the official Rails svn (closes #9514) [lifofifo]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7454 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5181 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4758 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4325 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. [Rick Olson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4022 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

Rework table aliasing to account for truncated table aliases.  Add smarter table aliasing when doing eager loading of STI associations. This allows you to use the association name in the order/where clause. [Jonathan Viney / Rick Olson] closes #4108

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3921 5ecf4fe2-1ee6-0310-87b1-e25e094e27de