diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-11-05 10:21:14 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-11-05 10:21:14 -0700 |
commit | d5e45931a0f3d36515d6048fd9cb13f641018571 (patch) | |
tree | 7d570ed6449649b625d43e70012f325da3d54ffc /activerecord/lib | |
parent | 0f45f2366945a19e1413d15608b917e1b7987fa5 (diff) | |
download | rails-d5e45931a0f3d36515d6048fd9cb13f641018571.tar.gz rails-d5e45931a0f3d36515d6048fd9cb13f641018571.tar.bz2 rails-d5e45931a0f3d36515d6048fd9cb13f641018571.zip |
renaming exec in the mysql adapter
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 7d47d06ae1..ce2352486b 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -326,7 +326,7 @@ module ActiveRecord @statements.clear end - def exec(sql, name = 'SQL', binds = []) + def exec_query(sql, name = 'SQL', binds = []) log(sql, name) do result = nil @@ -708,7 +708,7 @@ module ActiveRecord def select(sql, name = nil, binds = []) @connection.query_with_result = true - rows = exec(sql, name, binds).to_a + rows = exec_query(sql, name, binds).to_a @connection.more_results && @connection.next_result # invoking stored procedures with CLIENT_MULTI_RESULTS requires this to tidy up else connection will be dropped rows end |