Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 9 insertions, 9 deletions

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