Changeset 8979

Timestamp:

03/03/08 06:56:31 (5 months ago)

Author:

nzkoz

Message:

Make the schema dumper respect the schema settings in database.yml. References #8659 [sveiss]

Files:

• trunk/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/schema_test_postgresql.rb (modified) (4 diffs)

trunk/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -487 +487 @@
-      # Returns the list of all indexes for a table.
-      def indexes(table_name, name = nil)
-
-
-
+
+
+
+
-           WHERE i.relkind = 'i'
-             AND d.indexrelid = i.oid
@@ -495 +496 @@
-             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

trunk/activerecord/test/cases/schema_test_postgresql.rb

@@ -5 +5 @@
-
-  SCHEMA_NAME = 'test_schema'
+  SCHEMA2_NAME = 'test_schema2'
-  TABLE_NAME = 'things'
+  INDEX_A_NAME = 'a_index_things_on_name'
+  INDEX_B_NAME = 'b_index_things_on_different_columns_in_each_schema'
+  INDEX_A_COLUMN = 'name'
+  INDEX_B_COLUMN_S1 = 'email'
+  INDEX_B_COLUMN_S2 = 'moment'
-  COLUMNS = [
-    'id integer',
-    'name character varying(50)',
+    'email character varying(50)',
-    'moment timestamp without time zone default now()'
-  ]
@@ -15 +22 @@
-    @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_A_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_A_COLUMN});"
+    @connection.execute "CREATE INDEX #{INDEX_A_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_A_COLUMN});"
+    @connection.execute "CREATE INDEX #{INDEX_B_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_B_COLUMN_S1});"
+    @connection.execute "CREATE INDEX #{INDEX_B_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_B_COLUMN_S2});"
-  end
-
-  def teardown
+    @connection.execute "DROP SCHEMA #{SCHEMA2_NAME} CASCADE"
-    @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
-  end
@@ -49 +62 @@
-  end
-
+  def test_dump_indexes_for_schema_one
+    do_dump_index_tests_for_schema(SCHEMA_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S1)
+  end
+
+  def test_dump_indexes_for_schema_two
+    do_dump_index_tests_for_schema(SCHEMA2_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S2)
+  end
+
-  private
-    def columns(table_name)
@@ -62 +83 @@
-      @connection.schema_search_path = "'$user', public"
-    end
+
+    def do_dump_index_tests_for_schema(this_schema_name, first_index_column_name, second_index_column_name)
+      with_schema_search_path(this_schema_name) do
+        indexes = @connection.indexes(TABLE_NAME).sort_by {|i| i.name}
+        assert_equal 2,indexes.size
+
+        do_dump_index_assertions_for_one_index(indexes[0], INDEX_A_NAME, first_index_column_name)
+        do_dump_index_assertions_for_one_index(indexes[1], INDEX_B_NAME, second_index_column_name)
+      end
+    end
+
+    def do_dump_index_assertions_for_one_index(this_index, this_index_name, this_index_column)
+      assert_equal TABLE_NAME, this_index.table
+      assert_equal 1, this_index.columns.size
+      assert_equal this_index_column, this_index.columns[0]
+      assert_equal this_index_name, this_index.name
+    end
-end