aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-02-26 16:05:15 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-26 16:05:15 -0800
commitf3e9cbc6955af8f430e75cf5d61e5940f7f46591 (patch)
tree6b1c095f5f50f61341794095d2b21ff0d7afa5bf /activerecord
parent54a2bf66019d2694ff53f666765faf5bca927c09 (diff)
downloadrails-f3e9cbc6955af8f430e75cf5d61e5940f7f46591.tar.gz
rails-f3e9cbc6955af8f430e75cf5d61e5940f7f46591.tar.bz2
rails-f3e9cbc6955af8f430e75cf5d61e5940f7f46591.zip
use an attribute rather than a SQL literal
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
-rw-r--r--activerecord/test/cases/base_test.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index f76681e880..4330d850fe 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -284,7 +284,7 @@ module ActiveRecord
@implicit_readonly = false
arel.project(*selects)
else
- arel.project(Arel.sql(@klass.quoted_table_name + '.*'))
+ arel.project(@klass.arel_table[Arel.star])
end
end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 0ad20bb9bc..b62b5003e4 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -134,6 +134,7 @@ class BasicsTest < ActiveRecord::TestCase
fakepool = Class.new(Struct.new(:spec)) {
def with_connection; yield self; end
def connection_pool; self; end
+ def table_exists?(name); false; end
def quote_table_name(*args); raise "lol quote_table_name"; end
}