Ticket #8659: index_dump_in_postgresql_adapter_and_matching_test_case.patch

test/schema_test_postgresql.rb

@@ -4 +4 @@
-  self.use_transactional_fixtures = false
-
-  SCHEMA_NAME = 'test_schema'
+  SCHEMA2_NAME = 'test_schema2'
-  TABLE_NAME = 'things'
+  INDEX_NAME = 'index_things_on_name'
+  INDEX_COLUMN = 'name'
-  COLUMNS = [
-    'id integer',
-    'name character varying(50)',
@@ -14 +17 @@
-  def setup
-    @connection = ActiveRecord::Base.connection
-    @connection.execute "CREATE SCHEMA #{SCHEMA_NAME} CREATE TABLE #{TABLE_NAME} (#{COLUMNS.join(',')})"
+    @connection.execute "CREATE SCHEMA #{SCHEMA2_NAME} CREATE TABLE #{TABLE_NAME} (#{COLUMNS.join(',')})"
+    @connection.execute "CREATE INDEX #{INDEX_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_COLUMN});"
+    @connection.execute "CREATE INDEX #{INDEX_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_COLUMN});" 
-  end
-
-  def teardown
+    @connection.execute "DROP INDEX #{SCHEMA2_NAME}.#{INDEX_NAME}"
+    @connection.execute "DROP INDEX #{SCHEMA_NAME}.#{INDEX_NAME}"
+    @connection.execute "DROP SCHEMA #{SCHEMA2_NAME} CASCADE"
-    @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
-  end
-
@@ -48 +57 @@
-    assert_nothing_raised { with_schema_search_path nil }
-  end
-
+  def test_dump_indexes
+    indexes = @connection.indexes(TABLE_NAME)    
+    assert_equal 1,indexes.size
+    idx = indexes[0]
+    assert_equal TABLE_NAME, idx.table
+    assert_equal 1, idx.columns.size
+    assert_equal INDEX_COLUMN, idx.columns[0]
+    assert_equal INDEX_NAME, idx.table.inspect
+    
+  end
-  private
-    def columns(table_name)
-      @connection.send(:column_definitions, table_name).map do |name, type, default|

lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -195 +195 @@
-      end
-
-      def indexes(table_name, name = nil) #:nodoc:
-
-
-
+
+
+
+
-           WHERE i.relkind = 'i'
-             AND d.indexrelid = i.oid
-             AND d.indisprimary = 'f'
-             AND t.oid = d.indrelid
-             AND t.relname = '#{table_name}'
+             AND t.relname = s.tablename
+             AND s.schemaname 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