diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-05-30 13:18:31 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-05-30 13:20:37 +0200 |
| commit | d6c1205584b1ba597db4071b168681678b1e9875 (patch) | |
| tree | f8d5c9d1da84cbe5baa65c8a32470ea6377d1769 /activerecord/lib/active_record | |
| parent | 6c2b569660c9216595d02ce6412e3bdcc7293317 (diff) | |
| download | rails-d6c1205584b1ba597db4071b168681678b1e9875.tar.gz rails-d6c1205584b1ba597db4071b168681678b1e9875.tar.bz2 rails-d6c1205584b1ba597db4071b168681678b1e9875.zip | |
pg, `default_sequence_name` respects schema. Closes #7516.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index 0eaaa97454..09db337a82 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -273,9 +273,9 @@ module ActiveRecord def default_sequence_name(table_name, pk = nil) #:nodoc: result = serial_sequence(table_name, pk || 'id') return nil unless result - result.split('.').last + Utils.extract_schema_qualified_name(result) rescue ActiveRecord::StatementInvalid - "#{table_name}_#{pk || 'id'}_seq" + PostgreSQL::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq") end def serial_sequence(table, column) |