Permalink
Browse files

r3401@asus: jeremy | 2005-12-07 23:30:11 -0800

 Apply [3252] to stable.  Oracle: active? performs a select instead of a commit.  Closes #3133.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3253 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 93bd3b0 commit 94a25200a1721fd9eecca0164111198dfcafcb56 @jeremy jeremy committed Dec 8, 2005
Showing with 6 additions and 1 deletion.
  1. +5 −0 activerecord/CHANGELOG
  2. +1 −1 activerecord/lib/active_record/connection_adapters/oci_adapter.rb
View
@@ -1,3 +1,8 @@
+*SVN*
+
+* Oracle: active? performs a select instead of a commit. #3133 [Michael Schoen]
+
+
*1.13.1* (December 7th, 2005)
* MySQL: more robust test for nullified result hashes. #3124 [Stefan Kaes]
@@ -550,7 +550,7 @@ def initialize(config, factory = OCIConnectionFactory.new)
# checks the connection, while #active? simply returns the last
# known state.
def ping
- @connection.commit
+ @connection.exec("select 1 from dual") { |r| nil }
@active = true
rescue
@active = false

0 comments on commit 94a2520

Please sign in to comment.