aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-07-03 08:32:27 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-07-03 08:32:27 +0000
commit45c4b07f5a4e1d7c058d19345c0d0f808ce1abe7 (patch)
treea4ca0255b524a525683f34ecbbe5cb397706c54d /activerecord/lib/active_record/connection_adapters/oci_adapter.rb
parentf51f12d81926ffe3845b6df9a51107edf4c997fe (diff)
downloadrails-45c4b07f5a4e1d7c058d19345c0d0f808ce1abe7.tar.gz
rails-45c4b07f5a4e1d7c058d19345c0d0f808ce1abe7.tar.bz2
rails-45c4b07f5a4e1d7c058d19345c0d0f808ce1abe7.zip
r1611@asus: jeremy | 2005-07-03 04:21:52 -0700
No longer pass superfluous connection to AbstractAdapter#log. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/oci_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/oci_adapter.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
index ec3bac67d3..3988d1aa96 100644
--- a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb
@@ -125,7 +125,7 @@ begin
elsif offset > 0
sql = "select * from (select raw_sql_.*, rownum raw_rnum_ from (#{sql}) raw_sql_) where raw_rnum_ > #{offset}"
end
- cursor = log(sql, name, @connection) { @connection.exec sql }
+ cursor = log(sql, name) { @connection.exec sql }
cols = cursor.get_col_names.map { |x| x.downcase }
rows = []
while row = cursor.fetch
@@ -167,16 +167,16 @@ begin
if pk.nil? # Who called us? What does the sql look like? No idea!
execute sql, name
elsif id_value # Pre-assigned id
- log(sql, name, @connection) { @connection.exec sql }
+ log(sql, name) { @connection.exec sql }
else # Assume the sql contains a bind-variable for the id
id_value = select_one("select rails_sequence.nextval id from dual")['id']
- log(sql, name, @connection) { @connection.exec sql, id_value }
+ log(sql, name) { @connection.exec sql, id_value }
end
id_value
end
def execute(sql, name = nil)
- log(sql, name, @connection) { @connection.exec sql }
+ log(sql, name) { @connection.exec sql }
end
alias :update :execute