renaming exec in the PG adapter

3 files changed, 14 insertions, 14 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 58c0f85dc2..426360b470 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -398,7 +398,7 @@ module ActiveRecord
       # Set the authorized user for this session
       def session_auth=(user)
         clear_cache!
-        exec "SET SESSION AUTHORIZATION #{user}"
+        exec_query "SET SESSION AUTHORIZATION #{user}"
       end
 
       # REFERENTIAL INTEGRITY ====================================
@@ -532,7 +532,7 @@ module ActiveRecord
         Arel.sql("$#{current_values.length + 1}")
       end
 
-      def exec(sql, name = 'SQL', binds = [])
+      def exec_query(sql, name = 'SQL', binds = [])
         return exec_no_cache(sql, name) if binds.empty?
 
         log(sql, name) do
@@ -1040,7 +1040,7 @@ module ActiveRecord
         # Executes a SELECT query and returns the results, performing any data type
         # conversions that are required to be performed here instead of in PostgreSQLColumn.
         def select(sql, name = nil, binds = [])
-          exec(sql, name, binds).to_a
+          exec_query(sql, name, binds).to_a
         end
 
         def select_raw(sql, name = nil)
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index b0fd2273df..b0a4a4e39d 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -5,8 +5,8 @@ module ActiveRecord
     class PostgreSQLAdapterTest < ActiveRecord::TestCase
       def setup
         @connection = ActiveRecord::Base.connection
-        @connection.exec('drop table if exists ex')
-        @connection.exec('create table ex(id serial primary key, data character varying(255))')
+        @connection.exec_query('drop table if exists ex')
+        @connection.exec_query('create table ex(id serial primary key, data character varying(255))')
       end
 
       def test_table_alias_length
@@ -16,14 +16,14 @@ module ActiveRecord
       end
 
       def test_exec_no_binds
-        result = @connection.exec('SELECT id, data FROM ex')
+        result = @connection.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
 
         string = @connection.quote('foo')
-        @connection.exec("INSERT INTO ex (id, data) VALUES (1, #{string})")
-        result = @connection.exec('SELECT id, data FROM ex')
+        @connection.exec_query("INSERT INTO ex (id, data) VALUES (1, #{string})")
+        result = @connection.exec_query('SELECT id, data FROM ex')
         assert_equal 1, result.rows.length
         assert_equal 2, result.columns.length
 
@@ -32,8 +32,8 @@ module ActiveRecord
 
       def test_exec_with_binds
         string = @connection.quote('foo')
-        @connection.exec("INSERT INTO ex (id, data) VALUES (1, #{string})")
-        result = @connection.exec(
+        @connection.exec_query("INSERT INTO ex (id, data) VALUES (1, #{string})")
+        result = @connection.exec_query(
           'SELECT id, data FROM ex WHERE id = $1', nil, [[nil, 1]])
 
         assert_equal 1, result.rows.length
@@ -44,10 +44,10 @@ module ActiveRecord
 
       def test_exec_typecasts_bind_vals
         string = @connection.quote('foo')
-        @connection.exec("INSERT INTO ex (id, data) VALUES (1, #{string})")
+        @connection.exec_query("INSERT INTO ex (id, data) VALUES (1, #{string})")
 
         column = @connection.columns('ex').find { |col| col.name == 'id' }
-        result = @connection.exec(
+        result = @connection.exec_query(
           'SELECT id, data FROM ex WHERE id = $1', nil, [[column, '1-fuu']])
 
         assert_equal 1, result.rows.length
diff --git a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
index 881631fb19..d5e1838543 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
@@ -55,7 +55,7 @@ class SchemaAuthorizationTest < ActiveRecord::TestCase
       set_session_auth
       USERS.each do |u|
         set_session_auth u
-        assert_equal u, @connection.exec("SELECT name FROM #{TABLE_NAME} WHERE id = $1", 'SQL', [[nil, 1]]).first['name']
+        assert_equal u, @connection.exec_query("SELECT name FROM #{TABLE_NAME} WHERE id = $1", 'SQL', [[nil, 1]]).first['name']
         set_session_auth
       end
     end
@@ -67,7 +67,7 @@ class SchemaAuthorizationTest < ActiveRecord::TestCase
       USERS.each do |u|
         @connection.clear_cache!
         set_session_auth u
-        assert_equal u, @connection.exec("SELECT name FROM #{TABLE_NAME} WHERE id = $1", 'SQL', [[nil, 1]]).first['name']
+        assert_equal u, @connection.exec_query("SELECT name FROM #{TABLE_NAME} WHERE id = $1", 'SQL', [[nil, 1]]).first['name']
         set_session_auth
       end
     end