aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/calculations_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-06-03 21:47:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-06-03 21:47:29 +0000
commit6a9f47f33f853c6899bb50bf21e49da798bdd12e (patch)
treebec4db9303260814873bb369fce8b585199a9951 /activerecord/test/calculations_test.rb
parent7f00f51239f112ef6c70293665bcf0a5e2c313db (diff)
downloadrails-6a9f47f33f853c6899bb50bf21e49da798bdd12e.tar.gz
rails-6a9f47f33f853c6899bb50bf21e49da798bdd12e.tar.bz2
rails-6a9f47f33f853c6899bb50bf21e49da798bdd12e.zip
Make more Firebird tests pass (closes #5188) [kennethkunz@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4420 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/calculations_test.rb')
-rw-r--r--activerecord/test/calculations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/calculations_test.rb b/activerecord/test/calculations_test.rb
index 785a4d10b4..67de1b9bd5 100644
--- a/activerecord/test/calculations_test.rb
+++ b/activerecord/test/calculations_test.rb
@@ -133,7 +133,7 @@ class CalculationsTest < Test::Unit::TestCase
end
def test_should_calculate_grouped_by_function
- c = Company.count(:all, :group => 'UPPER(type)')
+ c = Company.count(:all, :group => "UPPER(#{QUOTED_TYPE})")
assert_equal 2, c[nil]
assert_equal 1, c['DEPENDENTFIRM']
assert_equal 3, c['CLIENT']
@@ -141,7 +141,7 @@ class CalculationsTest < Test::Unit::TestCase
end
def test_should_calculate_grouped_by_function_with_table_alias
- c = Company.count(:all, :group => 'UPPER(companies.type)')
+ c = Company.count(:all, :group => "UPPER(companies.#{QUOTED_TYPE})")
assert_equal 2, c[nil]
assert_equal 1, c['DEPENDENTFIRM']
assert_equal 3, c['CLIENT']