From 1be2d1f5ce13b8babcf73488c89649e0cf2c27fc Mon Sep 17 00:00:00 2001
From: Michael Schuerig <michael@schuerig.de>
Date: Thu, 2 Apr 2009 14:59:59 +0200
Subject: [PATCH] Return indexed columns in the correct order.

---
 .../connection_adapters/postgresql_adapter.rb      |   31 +++++++++-----------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 913bb52..3a48be4 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -619,23 +619,20 @@ module ActiveRecord
 
       # Returns the list of all indexes for a table.
       def indexes(table_name, name = nil)
-         schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
-         result = query(<<-SQL, name)
-           SELECT distinct i.relname, d.indisunique, a.attname
-             FROM pg_class t, pg_class i, pg_index d, pg_attribute a
-           WHERE i.relkind = 'i'
-             AND d.indexrelid = i.oid
-             AND d.indisprimary = 'f'
-             AND t.oid = d.indrelid
-             AND t.relname = '#{table_name}'
-             AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
-             AND a.attrelid = t.oid
-             AND ( d.indkey[0]=a.attnum OR d.indkey[1]=a.attnum
-                OR d.indkey[2]=a.attnum OR d.indkey[3]=a.attnum
-                OR d.indkey[4]=a.attnum OR d.indkey[5]=a.attnum
-                OR d.indkey[6]=a.attnum OR d.indkey[7]=a.attnum
-                OR d.indkey[8]=a.attnum OR d.indkey[9]=a.attnum )
-          ORDER BY i.relname
+        schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
+        result = query(<<-SQL, name)
+          SELECT i.relname, d.indisunique, a.attname
+            FROM pg_class t, pg_class i, pg_index d, pg_attribute a,
+              generate_series(0, 9) AS c(i)
+          WHERE i.relkind = 'i'
+            AND d.indexrelid = i.oid
+            AND d.indisprimary = 'f'
+            AND t.oid = d.indrelid
+            AND t.relname = '#{table_name}'
+            AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
+            AND a.attrelid = t.oid
+            AND d.indkey[c.i]=a.attnum
+          ORDER BY i.relname, c.i
         SQL
 
         current_index = nil
-- 
1.6.2.1