diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-15 05:44:08 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-15 05:44:08 -0700 |
| commit | 1fb25b719d869a755952531e4b16902347233c25 (patch) | |
| tree | b61fc06f2d30abc9abd1e2b1cf55a42a755ca548 /activerecord/lib | |
| parent | 7078ec3f9899e9841d4425cda6908d2b72c246a1 (diff) | |
| parent | 36bc4f5a02f34c68d0e640ab84eb086a54cbd6ab (diff) | |
| download | rails-1fb25b719d869a755952531e4b16902347233c25.tar.gz rails-1fb25b719d869a755952531e4b16902347233c25.tar.bz2 rails-1fb25b719d869a755952531e4b16902347233c25.zip | |
Merge pull request #10925 from senny/10917_test_to_prevent_regression
regression test + mysql2 adapter raises correct error if conn is closed.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 530a27d099..edeb338310 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -213,9 +213,11 @@ module ActiveRecord # Executes the SQL statement in the context of this connection. def execute(sql, name = nil) - # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been - # made since we established the connection - @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone + if @connection + # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been + # made since we established the connection + @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone + end super end |