Query for sequence info also should be markd as SCHEMA.

kennyj · Sep 15, 2012 · 3dc4021 · 3dc4021
1 parent 8933efb
commit 3dc4021
Showing 1 changed file with 3 additions and 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
@@ -252,7 +252,7 @@ def reset_pk_sequence!(table, pk = nil, sequence = nil) #:nodoc:
           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 @@ def reset_pk_sequence!(table, pk = nil, sequence = nil) #:nodoc:
         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 @@ def pk_and_sequence_for(table) #:nodoc:
             # 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