Permalink
Browse files

Merge pull request #14999 from yahonda/modify_bind_variable_name

Modify assert conditions not to be affected
by each database bind variable naming conventions

Closes #14999.

Conflicts:
	activerecord/test/cases/relation/merging_test.rb
  • Loading branch information...
senny committed May 12, 2014
1 parent b489dbf commit 741abc944b2466cb8c637e6499220979ca8df15f
Showing with 3 additions and 2 deletions.
  1. +3 −2 activerecord/test/cases/relation/merging_test.rb
@@ -17,10 +17,11 @@ def test_relation_merging
end
def test_relation_to_sql
+ post = Post.first
sql = Post.connection.unprepared_statement do
- Post.first.comments.to_sql
+ post.comments.to_sql
end
- assert_no_match(/\?/, sql)
+ assert_match(/.?post_id.? = #{post.id}\Z/i, sql)
end
def test_relation_merging_with_arel_equalities_keeps_last_equality

0 comments on commit 741abc9

Please sign in to comment.