From 69c711f38cac85e9c8bdbe286591bf88ef720bfa Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Tue, 10 Jun 2014 13:28:38 +0200
Subject: fk: dump foreign keys to schema.rb

respect `table_name_prefix` and `table_name_suffix`.
---
 activerecord/test/cases/schema_dumper_test.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/cases/schema_dumper_test.rb')

diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 5f02d39e32..b1e7420c66 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -374,13 +374,19 @@ class SchemaDumperTest < ActiveRecord::TestCase
 
   class CreateDogMigration < ActiveRecord::Migration
     def up
+      create_table("dog_owners") do |t|
+      end
+
       create_table("dogs") do |t|
         t.column :name, :string
+        t.column :owner_id, :integer
       end
       add_index "dogs", [:name]
+      add_foreign_key :dogs, :dog_owners, column: "owner_id" if supports_foreign_keys?
     end
     def down
       drop_table("dogs")
+      drop_table("dog_owners")
     end
   end
 
@@ -396,13 +402,17 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_no_match %r{create_table "foo_.+_bar"}, output
     assert_no_match %r{add_index "foo_.+_bar"}, output
     assert_no_match %r{create_table "schema_migrations"}, output
+
+    if ActiveRecord::Base.connection.supports_foreign_keys?
+      assert_no_match %r{add_foreign_key "foo_.+_bar"}, output
+      assert_no_match %r{add_foreign_key "[^"]+", "foo_.+_bar"}, output
+    end
   ensure
     migration.migrate(:down)
 
     ActiveRecord::Base.table_name_suffix = ActiveRecord::Base.table_name_prefix = ''
     $stdout = original
   end
-
 end
 
 class SchemaDumperDefaultsTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From 0938d5305758dfcbec4e813c777bb627e82a5906 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 11 Jun 2014 11:35:26 +0200
Subject: fk: dump foreign keys at the bottom to make sure tables exist.

---
 activerecord/test/cases/schema_dumper_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/test/cases/schema_dumper_test.rb')

diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index b1e7420c66..4e71d04bc0 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -372,6 +372,13 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_match %r{create_table "subscribers", id: false}, output
   end
 
+  if ActiveRecord::Base.connection.supports_foreign_keys?
+    def test_foreign_keys_are_dumped_at_the_bottom_to_circumvent_dependency_issues
+      output = standard_dump
+      assert_match(/^\s+add_foreign_key "fk_test_has_fk"[^\n]+\n\s+add_foreign_key "lessons_students"/, output)
+    end
+  end
+
   class CreateDogMigration < ActiveRecord::Migration
     def up
       create_table("dog_owners") do |t|
-- 
cgit v1.2.3