Permalink
Browse files

Merge [5761] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a451fd1 commit 4dcdf0834e5e3ec148cafe9dd51e3459d132076f @jeremy jeremy committed Dec 20, 2006
Showing with 3 additions and 1 deletion.
  1. +2 −0 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
View
@@ -1,5 +1,7 @@
*1.15.0 RC2*
+* 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 @@ def ping
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

0 comments on commit 4dcdf08

Please sign in to comment.