diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-03-26 04:08:50 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-03-26 04:08:50 +0000 |
| commit | 56af14d5aaa0f052d0abe0e06f60b23167c869ff (patch) | |
| tree | 4e004dc90a910b67384cd9bd0ccb93638aa842a5 /activerecord | |
| parent | 45e59c8a51a152d5f0b915924d2862d737b71c75 (diff) | |
| download | rails-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')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index bba5fd93c3..f21d6e7f97 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x. Closes #4348 [Rick] + * Fixed issue that kept :select options from being scoped [Rick] * Fixed db_schema_import when binary types are present #3101 [DHH] 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 |