diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 12:42:21 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 12:42:21 -0700 |
| commit | 7bc8d7b8289049762acb858860668b13834a378f (patch) | |
| tree | f1ccd658a6127f91253fafbba97af0ed23c31d22 | |
| parent | 4110abea002a1725b9a1c80df44cc46842a66856 (diff) | |
| parent | b79c1314a92b3b7a85db4594ec109c14a4ad3bc8 (diff) | |
| download | rails-7bc8d7b8289049762acb858860668b13834a378f.tar.gz rails-7bc8d7b8289049762acb858860668b13834a378f.tar.bz2 rails-7bc8d7b8289049762acb858860668b13834a378f.zip | |
Merge pull request #10464 from arkiver/master
Fix to remove warning in postgres adapter test
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/uuid_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index df729259e9..88b09e7999 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -768,7 +768,7 @@ module ActiveRecord end def exec_cache(sql, binds) - stmt_key = prepare_statement sql + stmt_key = prepare_statement(sql) # Clear the queue @connection.get_last_result diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb index 0bd9c864ec..b573d48807 100644 --- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb +++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb @@ -60,7 +60,7 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase def test_schema_dumper_for_uuid_primary_key schema = StringIO.new ActiveRecord::SchemaDumper.dump(@connection, schema) - assert_match /\bcreate_table "pg_uuids", id: :uuid\b/, schema.string + assert_match(/\bcreate_table "pg_uuids", id: :uuid\b/, schema.string) end end |