diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-03-26 17:36:06 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-03-26 17:36:42 -0600 |
| commit | 3b50a7a3e18e1ae5ea1d76927e37021f50389abc (patch) | |
| tree | b3130dcfa4d6ee717ceb2aeca82e20f5ec45ee1f /activerecord/test/cases/adapters/postgresql/schema_test.rb | |
| parent | 8b451e3a315666b93da43e7b61503014661f0ac6 (diff) | |
| parent | 1d8d5a74b81b8aab1f5e6d233d509a92525ed4e1 (diff) | |
| download | rails-3b50a7a3e18e1ae5ea1d76927e37021f50389abc.tar.gz rails-3b50a7a3e18e1ae5ea1d76927e37021f50389abc.tar.bz2 rails-3b50a7a3e18e1ae5ea1d76927e37021f50389abc.zip | |
Partially merge #17650
Merges 1d8d5a74b81b8aab1f5e6d233d509a92525ed4e1. The pull request as a
whole is quite large, and I'm reviewing the smaller pieces individually.
Diffstat (limited to 'activerecord/test/cases/adapters/postgresql/schema_test.rb')
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/schema_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb index c1be340e7c..f925dcad97 100644 --- a/activerecord/test/cases/adapters/postgresql/schema_test.rb +++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb @@ -384,16 +384,16 @@ class SchemaTest < ActiveRecord::TestCase def test_reset_pk_sequence sequence_name = "#{SCHEMA_NAME}.#{UNMATCHED_SEQUENCE_NAME}" @connection.execute "SELECT setval('#{sequence_name}', 123)" - assert_equal "124", @connection.select_value("SELECT nextval('#{sequence_name}')") + assert_equal 124, @connection.select_value("SELECT nextval('#{sequence_name}')") @connection.reset_pk_sequence!("#{SCHEMA_NAME}.#{UNMATCHED_PK_TABLE_NAME}") - assert_equal "1", @connection.select_value("SELECT nextval('#{sequence_name}')") + assert_equal 1, @connection.select_value("SELECT nextval('#{sequence_name}')") end def test_set_pk_sequence table_name = "#{SCHEMA_NAME}.#{PK_TABLE_NAME}" _, sequence_name = @connection.pk_and_sequence_for table_name @connection.set_pk_sequence! table_name, 123 - assert_equal "124", @connection.select_value("SELECT nextval('#{sequence_name}')") + assert_equal 124, @connection.select_value("SELECT nextval('#{sequence_name}')") @connection.reset_pk_sequence! table_name end |