aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-05-30 13:18:31 +0200
committerYves Senn <yves.senn@gmail.com>2014-05-30 13:20:37 +0200
commitd6c1205584b1ba597db4071b168681678b1e9875 (patch)
treef8d5c9d1da84cbe5baa65c8a32470ea6377d1769 /activerecord/test/cases
parent6c2b569660c9216595d02ce6412e3bdcc7293317 (diff)
downloadrails-d6c1205584b1ba597db4071b168681678b1e9875.tar.gz
rails-d6c1205584b1ba597db4071b168681678b1e9875.tar.bz2
rails-d6c1205584b1ba597db4071b168681678b1e9875.zip
pg, `default_sequence_name` respects schema. Closes #7516.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index aaa874af7d..cfff1f980b 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -134,18 +134,18 @@ module ActiveRecord
end
def test_default_sequence_name
- assert_equal 'accounts_id_seq',
+ assert_equal PostgreSQL::Name.new('public', 'accounts_id_seq'),
@connection.default_sequence_name('accounts', 'id')
- assert_equal 'accounts_id_seq',
+ assert_equal PostgreSQL::Name.new('public', 'accounts_id_seq'),
@connection.default_sequence_name('accounts')
end
def test_default_sequence_name_bad_table
- assert_equal 'zomg_id_seq',
+ assert_equal PostgreSQL::Name.new(nil, 'zomg_id_seq'),
@connection.default_sequence_name('zomg', 'id')
- assert_equal 'zomg_id_seq',
+ assert_equal PostgreSQL::Name.new(nil, 'zomg_id_seq'),
@connection.default_sequence_name('zomg')
end
@@ -153,8 +153,7 @@ module ActiveRecord
with_example_table do
pk, seq = @connection.pk_and_sequence_for('ex')
assert_equal 'id', pk
- expected = PostgreSQL::Name.new("public", @connection.default_sequence_name('ex', 'id'))
- assert_equal expected, seq
+ assert_equal @connection.default_sequence_name('ex', 'id'), seq
end
end
@@ -162,8 +161,7 @@ module ActiveRecord
with_example_table 'code serial primary key' do
pk, seq = @connection.pk_and_sequence_for('ex')
assert_equal 'code', pk
- expected = PostgreSQL::Name.new("public", @connection.default_sequence_name('ex', 'code'))
- assert_equal expected, seq
+ assert_equal @connection.default_sequence_name('ex', 'code'), seq
end
end