aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-08 10:19:58 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-08 10:19:58 -0300
commit22f31214a01eb5ad39adf18ca3f7c53ae100f971 (patch)
treeb6917abc0dae2016c3555866f42eaffd08b01d93 /activerecord/test
parentde2815746873aaa9aee15e027adf605eb3b00d1d (diff)
parent9f549212c3b6c8ae4684da61e03a04da9f341fad (diff)
downloadrails-22f31214a01eb5ad39adf18ca3f7c53ae100f971.tar.gz
rails-22f31214a01eb5ad39adf18ca3f7c53ae100f971.tar.bz2
rails-22f31214a01eb5ad39adf18ca3f7c53ae100f971.zip
Merge pull request #8966 from cfabianski/disable_prepared_statement_when_preparing_a_query
Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relations_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 8298d7534c..26cbb03892 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -714,6 +714,13 @@ class RelationTest < ActiveRecord::TestCase
assert_equal [developers(:poor_jamis)], dev_with_count.to_a
end
+ def test_relation_to_sql
+ sql = Post.connection.unprepared_statement do
+ Post.first.comments.to_sql
+ end
+ assert_no_match(/\?/, sql)
+ end
+
def test_relation_merging_with_arel_equalities_keeps_last_equality
devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge(
Developer.where(Developer.arel_table[:salary].eq(9000))