diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-29 18:17:13 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-29 18:17:13 +0000 |
| commit | 14b60fc074d8a97379561003281df70053225e01 (patch) | |
| tree | 5c91af8c5ee5942ef53a8fee5971b44511ee25e4 | |
| parent | 39ada91f8095f08a528ff84b5c880a1459f89145 (diff) | |
| download | rails-14b60fc074d8a97379561003281df70053225e01.tar.gz rails-14b60fc074d8a97379561003281df70053225e01.tar.bz2 rails-14b60fc074d8a97379561003281df70053225e01.zip | |
Worked around that connection can't be reset if allow_concurrency is off. Closes #2648.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2816 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index f34800a3e4..dcdbf541d6 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Worked around that connection can't be reset if allow_concurrency is off. #2648 [Michael Schoen <schoenm@earthlink.net>] + * Fixed SQL Server adapter to pass even more tests and do even better #2634 [rtomayko@gmail.com] * Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 [Tom Ward] diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index eab61085e3..7858d08b66 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -109,6 +109,7 @@ module ActiveRecord conn = @@defined_connections[klass] @@defined_connections.delete(klass) active_connections[klass] = nil + @connection = nil conn.config if conn end |