diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-01 15:25:54 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-01 15:25:54 -0300 |
| commit | 159c73ac6d1ea93dd1b59d17cc73c56df8b02b99 (patch) | |
| tree | 1901e212d628c138f62f83b054b1c5c4c77435f2 /activerecord/lib | |
| parent | 26fe5fa08d52384bcea09c4210e3b3baaf5e9b95 (diff) | |
| parent | 3cc62a977626bc9964d9f4bad85a997edf3a02c8 (diff) | |
| download | rails-159c73ac6d1ea93dd1b59d17cc73c56df8b02b99.tar.gz rails-159c73ac6d1ea93dd1b59d17cc73c56df8b02b99.tar.bz2 rails-159c73ac6d1ea93dd1b59d17cc73c56df8b02b99.zip | |
Merge pull request #23954 from kamipo/fix_undefined_method_fields
Fix `NoMethodError: undefined method `fields' for nil:NilClass`
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 57d8867bb4..ed8cfae657 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -131,7 +131,7 @@ module ActiveRecord def exec_query(sql, name = 'SQL', binds = [], prepare: false) result = execute(sql, name) @connection.next_result while @connection.more_results? - ActiveRecord::Result.new(result.fields, result.to_a) + ActiveRecord::Result.new(result.fields, result.to_a) if result end def exec_insert(sql, name, binds, pk = nil, sequence_name = nil) |