find sequences with pg schemas properly

1 files changed, 11 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 8b48c055ac..3e390ba994 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -805,8 +805,8 @@ module ActiveRecord
         end
 
         if pk && sequence
-          quoted_sequence = quote_column_name(sequence)
-
+          quoted_sequence = quote_table_name(sequence)
+          
           select_value <<-end_sql, 'Reset sequence'
             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
@@ -818,18 +818,25 @@ module ActiveRecord
         # First try looking for a sequence with a dependency on the
         # given table's primary key.
         result = exec_query(<<-end_sql, 'SCHEMA').rows.first
-          SELECT attr.attname, seq.relname
+          SELECT attr.attname, ns.nspname, seq.relname
           FROM pg_class seq
           INNER JOIN pg_depend dep ON seq.oid = dep.objid
           INNER JOIN pg_attribute attr ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
           INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
+          INNER JOIN pg_namespace ns ON seq.relnamespace = ns.oid
           WHERE seq.relkind  = 'S'
             AND cons.contype = 'p'
             AND dep.refobjid = '#{quote_table_name(table)}'::regclass
         end_sql
 
         # [primary_key, sequence]
-        [result.first, result.last]
+        if result.second ==  'public' then
+          sequence = result.last
+        else
+          sequence = result.second+'.'+result.last
+        end
+        
+        [result.first, sequence]
       rescue
         nil
       end