aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-26 04:08:50 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-26 04:08:50 +0000
commit56af14d5aaa0f052d0abe0e06f60b23167c869ff (patch)
tree4e004dc90a910b67384cd9bd0ccb93638aa842a5 /activerecord/lib/active_record/associations
parent45e59c8a51a152d5f0b915924d2862d737b71c75 (diff)
downloadrails-56af14d5aaa0f052d0abe0e06f60b23167c869ff.tar.gz
rails-56af14d5aaa0f052d0abe0e06f60b23167c869ff.tar.bz2
rails-56af14d5aaa0f052d0abe0e06f60b23167c869ff.zip
Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x. Closes #4348 [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4038 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 86c4077f86..9bc29b049f 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -155,7 +155,7 @@ module ActiveRecord
@finder_sql << " AND (#{conditions})" if conditions
end
- @join_sql = "JOIN #{@reflection.options[:join_table]} ON #{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{@reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
+ @join_sql = "INNER JOIN #{@reflection.options[:join_table]} ON #{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{@reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
end
end