0
@@ -1,5 +1,7 @@
0
 *1.12.1*
0
 
0
+* Correct PostgreSQL primary key sequence detection.  #2507 [tmornini@infomania.com]
0
+
0
 * Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
0
 
0
 *1.12.0* (October 16th, 2005)

0
@@ -205,8 +205,8 @@
0
 
0
       # Set the sequence to the max value of the table's pk.
0
       def reset_pk_sequence!(table)
0
-        sequence, pk = sequence_and_pk_for(table)
0
-        if sequence and pk
0
+        pk, sequence = pk_and_sequence_for(table)
0
+        if pk and sequence
0
           select_value <<-end_sql, 'Reset sequence'
0
             SELECT setval('#{sequence}', (SELECT COALESCE(MAX(#{pk})+(SELECT increment_by FROM #{sequence}), (SELECT min_value FROM #{sequence})) FROM #{table}), false)
0
           end_sql
0
0
0
@@ -214,19 +214,26 @@
0
       end
0
 
0
       # Find a table's primary key and sequence.
0
-      def sequence_and_pk_for(table, column = nil)
0
+      def pk_and_sequence_for(table)
0
         execute(<<-end_sql, 'Find pk sequence')[0]
0
-          SELECT (name.nspname || '.' || seq.relname) AS sequence, attr.attname AS pk
0
-          FROM pg_class seq, pg_attribute attr, pg_depend dep, pg_namespace name, pg_constraint cons
0
-          WHERE seq.oid = dep.objid
0
-            AND seq.relnamespace = name.oid
0
-            AND attr.attrelid = dep.refobjid
0
-            AND attr.attnum = dep.refobjsubid
0
-            AND attr.attrelid = cons.conrelid
0
-            AND attr.attnum = cons.conkey[1]
0
-            AND cons.contype = 'p'
0
-            AND dep.refobjid = '#{table}'::regclass
0
+          SELECT attr.attname, (name.nspname || '.' || seq.relname)
0
+          FROM pg_class      seq,
0
+               pg_attribute  attr,
0
+               pg_depend     dep,
0
+               pg_namespace  name,
0
+               pg_constraint cons
0
+          WHERE seq.oid           = dep.objid
0
+            AND seq.relnamespace  = name.oid
0
+            AND seq.relkind       = 'S'
0
+            AND attr.attrelid     = dep.refobjid
0
+            AND attr.attnum       = dep.refobjsubid
0
+            AND attr.attrelid     = cons.conrelid
0
+            AND attr.attnum       = cons.conkey[1]
0
+            AND cons.contype      = 'p'
0
+            AND dep.refobjid      = '#{table}'::regclass
0
         end_sql
0
+      rescue
0
+        nil
0
       end
0
 
0