converted exec to exec_query for sqlite

4 files changed, 27 insertions, 27 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index 6178130c00..ee9a0af35c 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -50,7 +50,7 @@ module ActiveRecord
       # Executes +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes.  +name+ is logged along with
       # the executed +sql+ statement.
-      def exec(sql, name = 'SQL', binds = [])
+      def exec_query(sql, name = 'SQL', binds = [])
       end
 
       # Returns the last auto-generated ID from the affected table.
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index fc4d84a4f2..d76fc4103e 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -143,7 +143,7 @@ module ActiveRecord
 
       # DATABASE STATEMENTS ======================================
 
-      def exec(sql, name = nil, binds = [])
+      def exec_query(sql, name = nil, binds = [])
         log(sql, name) do
 
           # Don't cache statements without bind values
@@ -186,7 +186,7 @@ module ActiveRecord
       alias :create :insert_sql
 
       def select_rows(sql, name = nil)
-        exec(sql, name).rows
+        exec_query(sql, name).rows
       end
 
       def begin_db_transaction #:nodoc:
@@ -210,7 +210,7 @@ module ActiveRecord
           WHERE type = 'table' AND NOT name = 'sqlite_sequence'
         SQL
 
-        exec(sql, name).map do |row|
+        exec_query(sql, name).map do |row|
           row['name']
         end
       end
@@ -222,12 +222,12 @@ module ActiveRecord
       end
 
       def indexes(table_name, name = nil) #:nodoc:
-        exec("PRAGMA index_list(#{quote_table_name(table_name)})", name).map do |row|
+        exec_query("PRAGMA index_list(#{quote_table_name(table_name)})", name).map do |row|
           IndexDefinition.new(
             table_name,
             row['name'],
             row['unique'] != 0,
-            exec("PRAGMA index_info('#{row['name']}')").map { |col|
+            exec_query("PRAGMA index_info('#{row['name']}')").map { |col|
               col['name']
             })
         end
@@ -241,11 +241,11 @@ module ActiveRecord
       end
 
       def remove_index!(table_name, index_name) #:nodoc:
-        exec "DROP INDEX #{quote_column_name(index_name)}"
+        exec_query "DROP INDEX #{quote_column_name(index_name)}"
       end
 
       def rename_table(name, new_name)
-        exec "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
+        exec_query "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
       end
 
       # See: http://www.sqlite.org/lang_altertable.html
@@ -282,7 +282,7 @@ module ActiveRecord
 
       def change_column_null(table_name, column_name, null, default = nil)
         unless null || default.nil?
-          exec("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+          exec_query("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
         end
         alter_table(table_name) do |definition|
           definition[column_name].null = null
@@ -314,7 +314,7 @@ module ActiveRecord
 
       protected
         def select(sql, name = nil, binds = []) #:nodoc:
-          result = exec(sql, name, binds)
+          result = exec_query(sql, name, binds)
           columns = result.columns.map { |column|
             column.sub(/^"?\w+"?\./, '')
           }
@@ -399,11 +399,11 @@ module ActiveRecord
           quoted_columns = columns.map { |col| quote_column_name(col) } * ','
 
           quoted_to = quote_table_name(to)
-          exec("SELECT * FROM #{quote_table_name(from)}").each do |row|
+          exec_query("SELECT * FROM #{quote_table_name(from)}").each do |row|
             sql = "INSERT INTO #{quoted_to} (#{quoted_columns}) VALUES ("
             sql << columns.map {|col| quote row[column_mappings[col]]} * ', '
             sql << ')'
-            exec sql
+            exec_query sql
           end
         end
 
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 {