mirror of
https://github.com/github/rails.git
synced 2026-01-29 16:28:09 -05:00
Oracle: fix connection reset failure. Closes #6846.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5761 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Oracle: fix connection reset failure. #6846 [leonlleslie]
|
||||
|
||||
* Subclass instantiation doesn't try to explicitly require the corresponding subclass. #6840 [leei, Jeremy Kemper]
|
||||
|
||||
* fix faulty inheritance tests and that eager loading grabs the wrong inheritance column when the class of your association is an STI subclass. Closes #6859 [protocool]
|
||||
|
||||
@@ -627,7 +627,7 @@ begin
|
||||
def reset!
|
||||
logoff rescue nil
|
||||
begin
|
||||
@connection = @factory.new_connection @username, @password, @database, @async
|
||||
@connection = @factory.new_connection @username, @password, @database, @async, @prefetch_rows, @cursor_sharing
|
||||
__setobj__ @connection
|
||||
@active = true
|
||||
rescue
|
||||
|
||||
Reference in New Issue
Block a user