diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:42:14 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:42:14 +0000 |
commit | 40bdbba48dfb80b824b1522fc99ca24669dea7b4 (patch) | |
tree | 310f3e351d69ea85b3e4859ea9772d6c047a6b52 /activerecord/test | |
parent | 9f3625dd0ae1691be3ea0b745a65149b9e4c2837 (diff) | |
download | rails-40bdbba48dfb80b824b1522fc99ca24669dea7b4.tar.gz rails-40bdbba48dfb80b824b1522fc99ca24669dea7b4.tar.bz2 rails-40bdbba48dfb80b824b1522fc99ca24669dea7b4.zip |
Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. Closes #5635.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4574 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rwxr-xr-x | activerecord/test/associations_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 86600c25d2..747d04cf3f 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -1621,6 +1621,12 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase end def test_join_with_group - assert_equal 2, Developer.find(:all, :include => {:projects => :developers}, :conditions => 'developers_projects_join.joined_on IS NOT NULL', :group => "developers.name").size + group = Developer.columns.inject([]) do |g, c| + g << "developers.#{c.name}" + g << "developers_projects_2.#{c.name}" + end + Project.columns.each { |c| group << "projects.#{c.name}" } + + assert_equal 3, Developer.find(:all, :include => {:projects => :developers}, :conditions => 'developers_projects_join.joined_on IS NOT NULL', :group => group.join(",")).size end end |