diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 8f375a3774..8bba746431 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that each request with the WEBrick adapter would open a new database connection #1685 [Sam Stephenson] + * Added support for SQL Server in the database rake tasks #1652 [ken.barker@gmail.com] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set. * Added a VERSION parameter to the migrate task that allows you to do "rake migrate VERSION=34" to migrate to the 34th version traveling up or down depending on the current version diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 71df5432e1..ba0541e7c6 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -8,6 +8,8 @@ include WEBrick ABSOLUTE_RAILS_ROOT = File.expand_path(RAILS_ROOT) +ActiveRecord::Base.threaded_connections = false + class CGI def stdinput @stdin || $stdin |