diff options
author | kennyj <kennyj@gmail.com> | 2012-09-15 14:31:55 +0900 |
---|---|---|
committer | kennyj <kennyj@gmail.com> | 2012-09-15 22:43:35 +0900 |
commit | 3dc402112e6f689675e4868866bffc69966e8a0f (patch) | |
tree | 3a2d898309da667d130fb508ed5fb5502caef9bc /activerecord/lib/active_record/connection_adapters | |
parent | 8933efb9fbcfd67c68d80065873fb381ef9bfc36 (diff) | |
download | rails-3dc402112e6f689675e4868866bffc69966e8a0f.tar.gz rails-3dc402112e6f689675e4868866bffc69966e8a0f.tar.bz2 rails-3dc402112e6f689675e4868866bffc69966e8a0f.zip |
Query for sequence info also should be markd as SCHEMA.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 6 |
1 files changed, 3 insertions, 3 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 6fc7c0fcc1..8a073bf878 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -252,7 +252,7 @@ module ActiveRecord if pk && sequence quoted_sequence = quote_table_name(sequence) - select_value <<-end_sql, 'Reset sequence' + select_value <<-end_sql, 'SCHEMA' SELECT setval('#{quoted_sequence}', (SELECT COALESCE(MAX(#{quote_column_name pk})+(SELECT increment_by FROM #{quoted_sequence}), (SELECT min_value FROM #{quoted_sequence})) FROM #{quote_table_name(table)}), false) end_sql end @@ -262,7 +262,7 @@ module ActiveRecord def pk_and_sequence_for(table) #:nodoc: # First try looking for a sequence with a dependency on the # given table's primary key. - result = query(<<-end_sql, 'PK and serial sequence')[0] + result = query(<<-end_sql, 'SCHEMA')[0] SELECT attr.attname, seq.relname FROM pg_class seq, pg_attribute attr, @@ -283,7 +283,7 @@ module ActiveRecord # If that fails, try parsing the primary key's default value. # Support the 7.x and 8.0 nextval('foo'::text) as well as # the 8.1+ nextval('foo'::regclass). - result = query(<<-end_sql, 'PK and custom sequence')[0] + result = query(<<-end_sql, 'SCHEMA')[0] SELECT attr.attname, CASE WHEN split_part(def.adsrc, '''', 2) ~ '.' THEN |