github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 08:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x. Closes #4348 [Rick]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4038 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Rick Olson
2006-03-26 04:08:50 +00:00
parent 45e59c8a51
commit 56af14d5aa
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@@ -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]

2
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
View File

@@ -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