Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: invalid plan generation when % in query on badge definition UI

This commit is contained in:
Sam 2015-05-28 16:06:22 +10:00
parent bb3fb37650
commit 1e4c7dfbe7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/services/badge_granter.rb
View File

@ -192,7 +192,8 @@ class BadgeGranter
end end
query_plan = nil query_plan = nil
query_plan = ActiveRecord::Base.exec_sql("EXPLAIN #{sql}", params) if opts[:explain] # HACK: active record is weird, force it to go down the sanitization path that cares not for % stuff
query_plan = ActiveRecord::Base.exec_sql("EXPLAIN #{sql} /*:backfill*/", params) if opts[:explain]
sample = SqlBuilder.map_exec(OpenStruct, grants_sql, params).map(&:to_h) sample = SqlBuilder.map_exec(OpenStruct, grants_sql, params).map(&:to_h)

4
spec/services/badge_granter_spec.rb
View File

@ -38,8 +38,10 @@ describe BadgeGranter do
describe 'preview' do describe 'preview' do
it 'can correctly preview' do it 'can correctly preview' do
Fabricate(:user, email: 'sam@gmail.com') Fabricate(:user, email: 'sam@gmail.com')
result = BadgeGranter.preview('select id user_id, null post_id, created_at granted_at from users where email like \'%gmail.com\'') result = BadgeGranter.preview('select id user_id, null post_id, created_at granted_at from users
where email like \'%gmail.com\'', explain: true)
expect(result[:grant_count]).to eq(1) expect(result[:grant_count]).to eq(1)
expect(result[:query_plan]).to be_present
end end
end end