From c0d7a27d9d704c3d0369b49423f443b9abedd1d3 Mon Sep 17 00:00:00 2001 From: Alireza Bashiri Date: Sun, 25 Nov 2018 20:10:56 +0700 Subject: When running exec_query MySQL always returns ActiveRecord::Result When running `exec_query` with `INSERT` (or other write commands), MySQL returns `ActiveRecord::Result`. --- .../connection_adapters/mysql/database_statements.rb | 12 ++++++++++-- activerecord/test/cases/adapter_test.rb | 5 +++++ 2 files changed, 15 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 diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb index d3ed59bccd..e40ae3090c 100644 --- a/activerecord/test/cases/adapter_test.rb +++ b/activerecord/test/cases/adapter_test.rb @@ -109,6 +109,11 @@ module ActiveRecord end end + def test_exec_query_returns_an_empty_result + result = @connection.exec_query "INSERT INTO subscribers(nick) VALUES('me')" + assert_instance_of(ActiveRecord::Result, result) + end + if current_adapter?(:Mysql2Adapter) def test_charset assert_not_nil @connection.charset -- cgit v1.2.3