diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-25 16:19:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-25 16:19:59 -0700 |
| commit | 5b918bb97cb1801945ef778508a3738da98012c5 (patch) | |
| tree | ae9962ad745422c2d77c48a25bbcfb45bb357345 /activerecord/test | |
| parent | 0a609eea504f72baead7548d47f0fe707314a033 (diff) | |
| download | rails-5b918bb97cb1801945ef778508a3738da98012c5.tar.gz rails-5b918bb97cb1801945ef778508a3738da98012c5.tar.bz2 rails-5b918bb97cb1801945ef778508a3738da98012c5.zip | |
using arel to compile sql statements
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/finder_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/fixtures/companies.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb index 31e4981a1d..c35590b84b 100644 --- a/activerecord/test/cases/finder_test.rb +++ b/activerecord/test/cases/finder_test.rb @@ -982,7 +982,7 @@ class FinderTest < ActiveRecord::TestCase def test_select_rows assert_equal( - [["1", nil, nil, "37signals"], + [["1", "1", nil, "37signals"], ["2", "1", "2", "Summit"], ["3", "1", "1", "Microsoft"]], Company.connection.select_rows("SELECT id, firm_id, client_of, name FROM companies WHERE id IN (1,2,3) ORDER BY id").map! {|i| i.map! {|j| j.to_s unless j.nil?}}) diff --git a/activerecord/test/fixtures/companies.yml b/activerecord/test/fixtures/companies.yml index ffaa097686..30b73d8e84 100644 --- a/activerecord/test/fixtures/companies.yml +++ b/activerecord/test/fixtures/companies.yml @@ -9,6 +9,7 @@ first_client: first_firm: id: 1 + firm_id: 1 type: Firm name: 37signals ruby_type: Firm |