kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fix set_pk_sequence and add a test for it.

Browse source
This commit is contained in:
Aaron Patterson 2014-10-31 18:01:06 -07:00
parent 4f6fb19662
commit 3dae34e217
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
View file

@ -303,7 +303,7 @@ module ActiveRecord
if pk if pk
if sequence if sequence
quoted_sequence = quote_column_name(sequence) quoted_sequence = quote_table_name(sequence)
select_value <<-end_sql, 'SCHEMA' select_value <<-end_sql, 'SCHEMA'
SELECT setval('#{quoted_sequence}', #{value}) SELECT setval('#{quoted_sequence}', #{value})

8
activerecord/test/cases/adapters/postgresql/schema_test.rb
View file

@ -388,6 +388,14 @@ class SchemaTest < ActiveRecord::TestCase
assert_equal "1", @connection.select_value("SELECT nextval('#{sequence_name}')") assert_equal "1", @connection.select_value("SELECT nextval('#{sequence_name}')")
end 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}')")
@connection.reset_pk_sequence! table_name
end
private private
def columns(table_name) def columns(table_name)
@connection.send(:column_definitions, table_name).map do |name, type, default| @connection.send(:column_definitions, table_name).map do |name, type, default|