diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-11-26 10:11:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 10:11:19 -0500 |
| commit | 0fe258dbf9e32422ab1281af0279fa0ef37429a9 (patch) | |
| tree | 976e9bc4aaf6e5ef55638bfae3f0b6b582b3e0dc /activerecord/lib/active_record/connection_adapters | |
| parent | 3c8259e1a982190ba19d288bb0a1ad8411587540 (diff) | |
| parent | c0d7a27d9d704c3d0369b49423f443b9abedd1d3 (diff) | |
| download | rails-0fe258dbf9e32422ab1281af0279fa0ef37429a9.tar.gz rails-0fe258dbf9e32422ab1281af0279fa0ef37429a9.tar.bz2 rails-0fe258dbf9e32422ab1281af0279fa0ef37429a9.zip | |
Merge pull request #34521 from azbshiri/mysql-exec-query-result
Test when using MySQL `exec_query` returns `ActiveRecord::Result` all…
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb index 684c7042a7..9ea237dd81 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb @@ -33,11 +33,19 @@ module ActiveRecord if without_prepared_statement?(binds) execute_and_free(sql, name) do |result| - ActiveRecord::Result.new(result.fields, result.to_a) if result + if result + ActiveRecord::Result.new(result.fields, result.to_a) + else + ActiveRecord::Result.new([], []) + end end else exec_stmt_and_free(sql, name, binds, cache_stmt: prepare) do |_, result| - ActiveRecord::Result.new(result.fields, result.to_a) if result + if result + ActiveRecord::Result.new(result.fields, result.to_a) + else + ActiveRecord::Result.new([], []) + end end end end |