mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove requirement that SQL starts with SELECT
This commit is contained in:
parent
53a5fe4a27
commit
0e77fa57f7
1 changed files with 5 additions and 5 deletions
|
@ -9,7 +9,7 @@ class AnnotateTest < ActiveRecord::TestCase
|
|||
def test_annotate_wraps_content_in_an_inline_comment
|
||||
quoted_posts_id, quoted_posts = regexp_escape_table_name("posts.id"), regexp_escape_table_name("posts")
|
||||
|
||||
assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do
|
||||
assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do
|
||||
posts = Post.select(:id).annotate("foo")
|
||||
assert posts.first
|
||||
end
|
||||
|
@ -18,22 +18,22 @@ class AnnotateTest < ActiveRecord::TestCase
|
|||
def test_annotate_is_sanitized
|
||||
quoted_posts_id, quoted_posts = regexp_escape_table_name("posts.id"), regexp_escape_table_name("posts")
|
||||
|
||||
assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do
|
||||
assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do
|
||||
posts = Post.select(:id).annotate("*/foo/*")
|
||||
assert posts.first
|
||||
end
|
||||
|
||||
assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do
|
||||
assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/}i) do
|
||||
posts = Post.select(:id).annotate("**//foo//**")
|
||||
assert posts.first
|
||||
end
|
||||
|
||||
assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/ /\* bar \*/}i) do
|
||||
assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* foo \*/ /\* bar \*/}i) do
|
||||
posts = Post.select(:id).annotate("*/foo/*").annotate("*/bar")
|
||||
assert posts.first
|
||||
end
|
||||
|
||||
assert_sql(%r{\ASELECT #{quoted_posts_id} FROM #{quoted_posts} /\* \+ MAX_EXECUTION_TIME\(1\) \*/}i) do
|
||||
assert_sql(%r{SELECT #{quoted_posts_id} FROM #{quoted_posts} /\* \+ MAX_EXECUTION_TIME\(1\) \*/}i) do
|
||||
posts = Post.select(:id).annotate("+ MAX_EXECUTION_TIME(1)")
|
||||
assert posts.first
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue