converted exec to exec_query for sqlite

2 files changed, 15 insertions, 15 deletions

diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 973c51f3d7..234696adeb 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -58,24 +58,24 @@ module ActiveRecord
       end
 
       def test_exec_no_binds
-        @conn.exec('create table ex(id int, data string)')
-        result = @conn.exec('SELECT id, data FROM ex')
+        @conn.exec_query('create table ex(id int, data string)')
+        result = @conn.exec_query('SELECT id, data FROM ex')
         assert_equal 0, result.rows.length
         assert_equal 2, result.columns.length
         assert_equal %w{ id data }, result.columns
 
-        @conn.exec('INSERT INTO ex (id, data) VALUES (1, "foo")')
-        result = @conn.exec('SELECT id, data FROM ex')
+        @conn.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+        result = @conn.exec_query('SELECT id, data FROM ex')
         assert_equal 1, result.rows.length
         assert_equal 2, result.columns.length
 
         assert_equal [[1, 'foo']], result.rows
       end
 
-      def test_exec_with_binds
-        @conn.exec('create table ex(id int, data string)')
-        @conn.exec('INSERT INTO ex (id, data) VALUES (1, "foo")')
-        result = @conn.exec(
+      def test_exec_query_with_binds
+        @conn.exec_query('create table ex(id int, data string)')
+        @conn.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+        result = @conn.exec_query(
           'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
 
         assert_equal 1, result.rows.length
@@ -84,12 +84,12 @@ module ActiveRecord
         assert_equal [[1, 'foo']], result.rows
       end
 
-      def test_exec_typecasts_bind_vals
-        @conn.exec('create table ex(id int, data string)')
-        @conn.exec('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      def test_exec_query_typecasts_bind_vals
+        @conn.exec_query('create table ex(id int, data string)')
+        @conn.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
         column = @conn.columns('ex').find { |col| col.name == 'id' }
 
-        result = @conn.exec(
+        result = @conn.exec_query(
           'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
 
         assert_equal 1, result.rows.length
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 8b0f3a739d..52f26b71f5 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -60,13 +60,13 @@ ActiveRecord::Base.connection.class.class_eval do
 
   alias_method_chain :execute, :query_record
 
-  def exec_with_query_record(sql, name = nil, binds = [], &block)
+  def exec_query_with_query_record(sql, name = nil, binds = [], &block)
     $queries_executed ||= []
     $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
-    exec_without_query_record(sql, name, binds, &block)
+    exec_query_without_query_record(sql, name, binds, &block)
   end
 
-  alias_method_chain :exec, :query_record
+  alias_method_chain :exec_query, :query_record
 end
 
 ActiveRecord::Base.connection.class.class_eval {