diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 17:23:28 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 17:23:28 +0000 |
| commit | 47dcc5ffc68e569cad48ac18a739f24511fff0ab (patch) | |
| tree | 95c8319a9690a92d7dbd2c732130880baebdd7a3 /activerecord/lib | |
| parent | 9b1fefbf542d09ecfc1c2d0101486250fe40b43c (diff) | |
| download | rails-47dcc5ffc68e569cad48ac18a739f24511fff0ab.tar.gz rails-47dcc5ffc68e569cad48ac18a739f24511fff0ab.tar.bz2 rails-47dcc5ffc68e569cad48ac18a739f24511fff0ab.zip | |
Fixed use of construct_finder_sql when using :join #1288 [dwlt@dwlt.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1316 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 37c3ca0e07..49d6a0c7d6 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -736,7 +736,7 @@ module ActiveRecord #:nodoc: def construct_finder_sql(options) sql = "SELECT * FROM #{table_name} " - sql << "#{options[:joins]} " if options[:joins] + sql << ", #{options[:joins]} " if options[:joins] add_conditions!(sql, options[:conditions]) sql << "ORDER BY #{options[:order]} " if options[:order] add_limit!(sql, options) |