aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-12-08 07:27:48 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-12-08 07:27:48 +0000
commit57838bd4c670e7332229b61feb69f196ddaf7d75 (patch)
treec1d5542c737df627386b22186e336478b9266fd8 /activerecord/lib/active_record/connection_adapters
parent32b27f997b68a998991ed62c4cadc5bdc114d34d (diff)
downloadrails-57838bd4c670e7332229b61feb69f196ddaf7d75.tar.gz
rails-57838bd4c670e7332229b61feb69f196ddaf7d75.tar.bz2
rails-57838bd4c670e7332229b61feb69f196ddaf7d75.zip
Oracle: active? performs a select instead of a commit. References #3133.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3252 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/oci_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
index b14ab571f2..01e3d4dff3 100644
--- a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
@@ -550,7 +550,7 @@ begin
# 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