schema_plus 1.8.9 → 2.0.0.pre1

data/spec/named_schemas_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "with multiple schemas" do
   def connection
@@ -35,52 +35,6 @@ describe "with multiple schemas" do
           end + ", login varchar(255))"
   end
 
-  context "with indexes in each schema" do
-    before(:each) do
-      connection.execute 'CREATE INDEX ' + case connection.adapter_name
-      when /^mysql/i then      "index_users_on_login ON schema_plus_test2.users"
-      when /^postgresql/i then "index_users_on_login ON schema_plus_test2.users"
-      when /^sqlite/i then     "schema_plus_test2.index_users_on_login ON users"
-      end + " (login)"
-    end
-
-    it "should not find indexes in other schema" do
-      User.reset_column_information
-      expect(User.indexes).to be_empty
-    end
-
-    it "should find index in current schema" do
-      connection.execute 'CREATE INDEX index_users_on_login ON users (login)'
-      User.reset_column_information
-      expect(User.indexes.map(&:name)).to eq(['index_users_on_login'])
-    end
-  end
-
-  context "with views in each schema" do
-    around(:each) do  |example|
-      begin
-        example.run
-      ensure
-        connection.execute 'DROP VIEW schema_plus_test2.myview' rescue nil
-        connection.execute 'DROP VIEW myview' rescue nil
-      end
-    end
-
-    before(:each) do
-      connection.views.each { |view| connection.drop_view view }
-      connection.execute 'CREATE VIEW schema_plus_test2.myview AS SELECT * FROM users'
-    end
-
-    it "should not find views in other schema" do
-      expect(connection.views).to be_empty
-    end
-
-    it "should find views in this schema" do
-      connection.execute 'CREATE VIEW myview AS SELECT * FROM users'
-      expect(connection.views).to eq(['myview'])
-    end
-  end
-
   context "with foreign key in each schema" do
     before(:each) do
       class Comment < ::ActiveRecord::Base ; end
@@ -116,9 +70,9 @@ describe "with multiple schemas" do
         t.integer :user_id, :foreign_key => true
       end
       Comment.reset_column_information
-      expect(Comment.foreign_keys.map(&:column_names).flatten).to eq(["user_id"])
+      expect(Comment.foreign_keys.map(&:column).flatten).to eq(["user_id"])
       User.reset_column_information
-      expect(User.reverse_foreign_keys.map(&:column_names).flatten).to eq(["user_id"])
+      expect(User.reverse_foreign_keys.map(&:column).flatten).to eq(["user_id"])
     end
 
   end
@@ -165,11 +119,11 @@ describe "with multiple schemas" do
     end
 
     it "should reference table in same schema" do
-      expect(Member.foreign_keys.map(&:references_table_name)).to include "schema_plus_test2.groups"
+      expect(Member.foreign_keys.map(&:to_table)).to include "schema_plus_test2.groups"
     end
 
     it "should reference table in default schema", :mysql => :skip do
-      expect(Member.foreign_keys.map(&:references_table_name)).to include "items"
+      expect(Member.foreign_keys.map(&:to_table)).to include "items"
     end
 
     it "should include the schema in the constraint name" do
@@ -179,41 +133,4 @@ describe "with multiple schemas" do
     end
   end
 
-  context "when using PostGIS", :postgresql => :only do
-    before(:all) do
-      begin
-        connection.execute "CREATE SCHEMA postgis"
-      rescue ActiveRecord::StatementInvalid => e
-        raise unless e.message =~ /already exists/
-      end
-    end
-
-    around(:each) do |example|
-      begin
-        connection.execute "SET search_path to '$user','public','postgis'"
-        example.run
-      ensure
-        connection.execute "SET search_path to '$user','public'"
-      end
-    end
-
-    before(:each) do
-      allow(connection).to receive(:adapter_name).and_return('PostGIS')
-    end
-
-    it "should hide views in postgis schema" do
-      begin
-        connection.create_view "postgis.hidden", "select 1", :force => true
-        connection.create_view :myview, "select 2", :force => true
-        expect(connection.views).to eq(["myview"])
-      ensure
-        connection.execute 'DROP VIEW postgis.hidden' rescue nil
-        connection.execute 'DROP VIEW myview' rescue nil
-      end
-    end
-  end
-
 end
-
-
-

data/spec/{column_spec.rb → schema_column_plus/column_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "Column" do
 
@@ -15,8 +15,6 @@ describe "Column" do
     end
     it "works properly" do
       type = case
-             when "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r <= "4.1".to_r
-               { "type" => "string" }
              when SchemaDev::Rspec::Helpers.mysql?
                { "sql_type" => "varchar(255)" }
              when SchemaDev::Rspec::Helpers.postgresql?
@@ -84,6 +82,31 @@ describe "Column" do
       end
     end
 
+    context "with case insensitive" do
+      before(:each) do
+        create_table(User, :login => { :index => {}})
+        User.reset_column_information
+        @column = User.columns.find(&its.name == "login")
+      end
+
+      context "index", :mysql => :skip do
+
+        it "reports column as case insensitive" do
+          allow(User.indexes.first).to receive(:case_sensitive?).and_return(false);
+          expect(@column).not_to be_case_sensitive
+        end
+      end
+
+      context "database", :mysql => :only do
+
+        # make sure we haven't broken mysql's method
+        it "reports column as case insensitive" do
+          allow(migration).to receive(:collation).and_return("utf8_unicode_ci") # mysql determines case insensitivity its own way
+          expect(@column).not_to be_case_sensitive
+        end
+      end
+    end
+
   end
 
   context "regarding when it requires a value" do
@@ -105,51 +128,6 @@ describe "Column" do
 
   end
 
-  context "using DB_DEFAULT" do
-
-    before(:each) do
-      create_table(User, :alpha => { :default => "gabba" }, :beta => {})
-    end
-
-    it "creating a record should respect default expression", :sqlite3 => :skip do
-      User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello")
-      expect(User.last.alpha).to eq("gabba")
-      expect(User.last.beta).to eq("hello")
-    end
-
-    it "creating a record should raise an error", :sqlite3 => :only do
-      expect { User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello") }.to raise_error ActiveRecord::StatementInvalid
-    end
-
-    it "updating a record should respect default expression", :sqlite3 => :skip do
-      u = User.create!(:alpha => "hey", :beta => "hello")
-      u.reload
-      expect(u.alpha).to eq("hey")
-      expect(u.beta).to eq("hello")
-      u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye")
-      u.reload
-      expect(u.alpha).to eq("gabba")
-      expect(u.beta).to eq("goodbye")
-    end
-
-    it "updating a record should raise an error", :sqlite3 => :only do
-      u = User.create!(:alpha => "hey", :beta => "hello")
-      expect { u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye") }.to raise_error ActiveRecord::StatementInvalid
-    end
-  end
-
-  context "Postgresql array", :postgresql => :only do
-
-    before(:each) do
-      create_table(User, :alpha => { :default => [], :array => true })
-    end
-
-    it "respects array: true" do
-      column = User.columns.find(&its.name == "alpha")
-      expect(column.array).to be_truthy
-    end
-  end if "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}".to_r >= "4.0".to_r
-
   protected
 
   def create_table(model, columns_with_options)

data/spec/schema_db_default/column_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe SchemaDbDefault do
+
+  let(:migration) { ::ActiveRecord::Migration }
+
+  before(:each) do
+    class User < ::ActiveRecord::Base ; end
+    create_table(User, :alpha => { :default => "gabba" }, :beta => {})
+  end
+
+  context "uses db default value", :sqlite3 => :skip do
+
+    it "when creating a record with DB_DEFAULT" do
+      User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello")
+      expect(User.last.alpha).to eq("gabba")
+      expect(User.last.beta).to eq("hello")
+    end
+
+    it "when updating a record with DB_DEFAULT" do
+      u = User.create!(:alpha => "hey", :beta => "hello")
+      u.reload
+      expect(u.alpha).to eq("hey")
+      expect(u.beta).to eq("hello")
+      u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye")
+      u.reload
+      expect(u.alpha).to eq("gabba")
+      expect(u.beta).to eq("goodbye")
+    end
+
+  end
+
+  context "raises an error", :sqlite3 => :only do
+
+    it "when creating a record with DB_DEFAULT" do
+      expect { User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello") }.to raise_error ActiveRecord::StatementInvalid
+    end
+
+    it "when updating a record with DB_DEFAULT" do
+      u = User.create!(:alpha => "hey", :beta => "hello")
+      expect { u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye") }.to raise_error ActiveRecord::StatementInvalid
+    end
+  end
+
+  protected
+
+  def create_table(model, columns_with_options)
+    migration.suppress_messages do
+      migration.create_table model.table_name, :force => true do |t|
+        columns_with_options.each_pair do |column, options|
+          t.send :string, column, options
+        end
+      end
+      model.reset_column_information
+    end
+  end
+end
+

data/spec/{column_default_spec.rb → schema_default_expr/column_default_spec.rb}

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
+require 'spec_helper'
 
 describe "Column definition" do
   before(:each) do

data/spec/schema_default_expr/schema_dumper_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+require 'stringio'
+
+describe "Schema dump" do
+
+  before(:all) do
+    SchemaPlus.setup do |config|
+      config.foreign_keys.auto_create = false
+    end
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Schema.define do
+        connection.tables.each do |table| drop_table table, :cascade => true end
+
+        create_table :posts, :force => true do |t|
+          t.text :body
+          t.integer :user_id
+          t.integer :first_comment_id
+          t.string :string_no_default
+          t.integer :short_id
+          t.string :str_short
+          t.integer :integer_col
+          t.float :float_col
+          t.decimal :decimal_col
+          t.datetime :datetime_col
+          t.timestamp :timestamp_col
+          t.time :time_col
+          t.date :date_col
+          t.binary :binary_col
+          t.boolean :boolean_col
+        end
+
+      end
+    end
+    class ::Post < ActiveRecord::Base ; end
+  end
+
+  context "with date default", :postgresql => :only do
+    it "should dump the default hash expr as now()" do
+      with_additional_column Post, :posted_at, :datetime, :default => :now do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
+      end
+    end
+
+    it "should dump the default hash expr as CURRENT_TIMESTAMP" do
+      with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>).*2001-09-28.*})
+      end
+    end
+
+    it "can dump a complex default expression" do
+      with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
+        expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
+      end
+    end
+  end
+
+  context "with date default", :sqlite3 => :only do
+    it "should dump the default hash expr as now" do
+      with_additional_column Post, :posted_at, :datetime, :default => :now do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
+      end
+    end
+
+    it "should dump the default hash expr string as now" do
+      with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
+        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
+      end
+    end
+
+    it "should dump the default value normally" do
+      with_additional_column Post, :posted_at, :string, :default => "now" do
+        expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
+      end
+    end
+  end
+
+  it "should leave out :default when default was changed to null" do
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
+    end
+    # mysql2 includes 'limit: 255' in the output.  that's OK, just want to
+    # make sure the full line doesn't have 'default' in it.
+    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*(,\s*limit:\s*\d+)?$})
+  end
+
+  protected
+  def to_regexp(string)
+    Regexp.new(Regexp.escape(string))
+  end
+
+  def with_additional_column(model, column_name, column_type, options)
+    table_columns = model.columns.reject{|column| column.name == 'id'}
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
+        table_columns.each do |column|
+          t.column column.name, column.type, :default => column.default
+        end
+        t.column column_name, column_type, options
+      end
+    end
+    yield
+  end
+
+  def dump_schema(opts={})
+    stream = StringIO.new
+    ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore]) || []
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    stream.string
+  end
+
+  def dump_posts
+    dump_schema(:ignore => %w[users comments])
+  end
+
+end
+

data/spec/schema_dumper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 require 'stringio'
 
 describe "Schema dump" do
@@ -49,13 +49,13 @@ describe "Schema dump" do
 
   it "should include foreign_key definition" do
     with_foreign_key Post, :user_id, :users, :id do
-      expect(dump_posts).to match(to_regexp(%q{t.foreign_key ["user_id"], "users", ["id"]}))
+      expect(dump_posts).to match(%r{t.integer\s+"user_id".*foreign_key.*users})
     end
   end
 
   it "should include foreign_key name" do
     with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
-      expect(dump_posts).to match(/foreign_key.*user_id.*users.*id.*:name => "yippee"/)
+      expect(dump_posts).to match(/user_id.*foreign_key.*users.*name: "yippee"/)
     end
   end
 
@@ -66,7 +66,7 @@ describe "Schema dump" do
   end
 
 
-  it "should sort foreign_key definitions" do
+  xit "should sort foreign_key definitions" do
     with_foreign_keys Comment, [ [ :post_id, :posts, :id ], [ :commenter_id, :users, :id ]] do
       expect(dump_schema).to match(/foreign_key.+commenter_id.+foreign_key.+post_id/m)
     end
@@ -94,183 +94,19 @@ describe "Schema dump" do
 
   end
 
-  context "with date default", :postgresql => :only do
-    it "should dump the default hash expr as now()" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
-      end
-    end
-
-    it "should dump the default hash expr as CURRENT_TIMESTAMP" do
-      with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>).*2001-09-28.*})
-      end
-    end
-
-    it "can dump a complex default expression" do
-      with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
-        expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
-      end
-    end
-  end
-
-  context "with date default", :sqlite3 => :only do
-    it "should dump the default hash expr as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
-      end
-    end
-
-    it "should dump the default hash expr string as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
-      end
-    end
-
-    it "should dump the default value normally" do
-      with_additional_column Post, :posted_at, :string, :default => "now" do
-        expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
-      end
-    end
-  end
-
-  it "should leave out :default when default was changed to null" do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
-    end
-    # mysql2 includes 'limit: 255' in the output.  that's OK, just want to
-    # make sure the full line doesn't have 'default' in it.
-    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*(,\s*limit:\s*\d+)?$})
-  end
-
   it "should include foreign_key options" do
-    with_foreign_key Post, :user_id, :users, :id, :on_update => :cascade, :on_delete => :set_null do
-      expect(dump_posts).to match(to_regexp(%q{t.foreign_key ["user_id"], "users", ["id"], :on_update => :cascade, :on_delete => :set_null}))
-    end
-  end
-
-  it "should include index definition" do
-    with_index Post, :user_id do
-      expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"]}))
-    end
-  end
-
-  it "should include index name" do
-    with_index Post, :user_id, :name => "custom_name" do
-      expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"], :name => "custom_name"}))
-    end
-  end
-
-  it "should define unique index" do
-    with_index Post, :user_id, :name => "posts_user_id_index", :unique => true do
-      expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"], :name => "posts_user_id_index", :unique => true}))
-    end
-  end
-
-  it "should sort indexes" do
-    with_index Post, :user_id do
-      with_index Post, :short_id do
-        expect(dump_posts).to match(/on_short_id.+on_user_id/m)
-      end
-    end
-  end
-
-  it "should include index order", :mysql => :skip do
-    with_index Post, [:user_id, :first_comment_id, :short_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
-      expect(dump_posts).to match(%r{t.index \["user_id", "first_comment_id", "short_id"\],.*:order => {"user_id" => :asc, "first_comment_id" => :desc, "short_id" => :asc}})
-    end
-  end
-
-  context "index extras", :postgresql => :only do
-
-    it "should define case insensitive index" do
-      with_index Post, [:body, :string_no_default], :case_sensitive => false do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["body", "string_no_default"], :name => "index_posts_on_body_and_string_no_default", :case_sensitive => false}))
-      end
-    end
-
-    it "should define index with type cast" do
-      with_index Post, [:integer_col], :name => "index_with_type_cast", :expression => "LOWER(integer_col::text)" do
-        expect(dump_posts).to match(to_regexp(%q{t.index :name => "index_with_type_cast", :expression => "lower((integer_col)::text)"}))
-      end
-    end
-
-
-    it "should define case insensitive index with mixed ids and strings" do
-      with_index Post, [:user_id, :str_short, :short_id, :body], :case_sensitive => false do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["user_id", "str_short", "short_id", "body"], :name => "index_posts_on_user_id_and_str_short_and_short_id_and_body", :case_sensitive => false}))
-      end
-    end
-
-    [:integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |col_type|
-      col_name = "#{col_type}_col"
-      it "should define case insensitive index that includes an #{col_type}" do
-        with_index Post, [:user_id, :str_short, col_name, :body], :case_sensitive => false do
-          expect(dump_posts).to match(to_regexp(%Q!t.index ["user_id", "str_short", "#{col_name}", "body"], :name => "index_posts_on_user_id_and_str_short_and_#{col_name}_and_body", :case_sensitive => false!))
-        end
-      end
-    end
-
-    it "should define conditions" do
-      with_index Post, :user_id, :name => "posts_user_id_index", :conditions => "user_id IS NOT NULL" do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"], :name => "posts_user_id_index", :conditions => "(user_id IS NOT NULL)"}))
-      end
-    end
-
-    it "should define expression" do
-      with_index Post, :name => "posts_freaky_index", :expression => "USING hash (least(id, user_id))" do
-        expect(dump_posts).to match(to_regexp(%q{t.index :name => "posts_freaky_index", :kind => "hash", :expression => "LEAST(id, user_id)"}))
-      end
-    end
-
-    it "should define operator_class" do
-      with_index Post, :body, :operator_class => 'text_pattern_ops' do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["body"], :name => "index_posts_on_body", :operator_class => {"body" => "text_pattern_ops"}}))
-      end
-    end
-
-    it 'should dump proper operator_class with case_sensitive => false' do
-      with_index Post, :body, :operator_class => 'text_pattern_ops', :case_sensitive => false do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["body"], :name => "index_posts_on_body", :case_sensitive => false, :operator_class => {"body" => "text_pattern_ops"}}))
-      end
-    end
-
-    it "should dump unique: true with expression (Issue #142)" do
-      with_index Post, :name => "posts_user_body_index", :unique => true, :expression => "BTRIM(LOWER(body))" do
-        expect(dump_posts).to match(%r{#{to_regexp(%q{t.index :name => "posts_user_body_index", :unique => true, :expression => "btrim(lower(body))"})}$})
-      end
-    end
-
-
-    it "should not define :case_sensitive => false with non-trivial expression" do
-      with_index Post, :name => "posts_user_body_index", :expression => "BTRIM(LOWER(body))" do
-        expect(dump_posts).to match(%r{#{to_regexp(%q{t.index :name => "posts_user_body_index", :expression => "btrim(lower(body))"})}$})
-      end
+    with_foreign_key Post, :user_id, :users, :id, :on_update => :cascade, :on_delete => :nullify do
+      expect(dump_posts).to match(%q[t.integer\s*"user_id",.*foreign_key: {references: "users", name: "fk_posts_user_id", on_update: :cascade, on_delete: :nullify}])
     end
-
-
-    it "should define kind" do
-      with_index Post, :name => "posts_body_index", :expression => "USING hash (body)" do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["body"], :name => "posts_body_index", :kind => "hash"}))
-      end
-    end
-
-    it "should not include index order for non-ordered index types" do
-      with_index Post, :user_id, :kind => :hash do
-        expect(dump_posts).to match(to_regexp(%q{t.index ["user_id"], :name => "index_posts_on_user_id", :kind => "hash"}))
-        expect(dump_posts).not_to match(%r{:order})
-      end
-    end
-
   end
 
   context "with cyclic foreign key constraints", :sqlite3 => :skip do
     before(:all) do
-      ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :commenter_id, User.table_name, :id)
-      ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, :post_id, Post.table_name, :id)
-      ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :first_comment_id, Comment.table_name, :id)
-      ActiveRecord::Base.connection.add_foreign_key(Post.table_name, :user_id, User.table_name, :id)
-      ActiveRecord::Base.connection.add_foreign_key(User.table_name, :first_post_id, Post.table_name, :id)
+      ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, User.table_name, column: :commenter_id)
+      ActiveRecord::Base.connection.add_foreign_key(Comment.table_name, Post.table_name, column: :post_id)
+      ActiveRecord::Base.connection.add_foreign_key(Post.table_name, Comment.table_name, column: :first_comment_id)
+      ActiveRecord::Base.connection.add_foreign_key(Post.table_name, User.table_name, column: :user_id)
+      ActiveRecord::Base.connection.add_foreign_key(User.table_name, Post.table_name, column: :first_post_id)
     end
 
     it "should not raise an error" do
@@ -278,124 +114,17 @@ describe "Schema dump" do
     end
 
     it "should dump constraints after the tables they reference" do
-      expect(dump_schema).to match(%r{create_table "comments".*foreign_key.*\["first_comment_id"\], "comments", \["id"\]}m)
-      expect(dump_schema).to match(%r{create_table "posts".*foreign_key.*\["first_post_id"\], "posts", \["id"\]}m)
-      expect(dump_schema).to match(%r{create_table "posts".*foreign_key.*\["post_id"\], "posts", \["id"\]}m)
-      expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["commenter_id"\], "users", \["id"\]}m)
-      expect(dump_schema).to match(%r{create_table "users".*foreign_key.*\["user_id"\], "users", \["id"\]}m)
-    end
-
-    context 'with complicated schemas' do
-      before(:all) do
-
-        SchemaPlus.setup do |config|
-          config.foreign_keys.auto_create = false
-        end
-        ActiveRecord::Migration.suppress_messages do
-          ActiveRecord::Schema.define do
-            connection.tables.each do |table| drop_table table, :cascade => true end
-
-            create_table :period_types, force: true do |t|
-              t.string  :name
-            end
-
-            create_table :grade_systems, force: true do |t|
-              t.string   :name
-              t.integer  :school_id
-              t.integer  :parent_id
-              t.integer  :profile_id
-            end
-
-            create_table :schools, force: true do |t|
-              t.string   :name
-              t.integer  :default_grade_system_id
-            end
-
-            create_table :academic_years, force: true do |t|
-              t.string  :name
-              t.integer :school_id
-              t.integer :period_type_id
-            end
-
-            create_table :buildings, force: true do |t|
-              t.string   :name
-              t.integer  :school_id
-            end
-
-            create_table :publishing_houses, force: true do |t|
-              t.string   :name
-            end
-
-            create_table :profiles, force: true do |t|
-              t.integer  :school_id
-              t.integer  :publishing_house_id
-              t.integer  :building_id
-            end
-
-            create_table :class_units, force: true do |t|
-              t.string   :name
-              t.integer  :school_id
-              t.integer  :mentor_id
-              t.integer  :building_id
-            end
-          end
-        end
-
-        class ::AcademicYear < ActiveRecord::Base ; end
-        class ::Building < ActiveRecord::Base ; end
-        class ::ClassUnit < ActiveRecord::Base ; end
-        class ::GradeSystem < ActiveRecord::Base ; end
-        class ::Profile < ActiveRecord::Base ; end
-        class ::PublishingHouse < ActiveRecord::Base ; end
-        class ::PeriodType < ActiveRecord::Base ; end
-        class ::School < ActiveRecord::Base ; end
-
-        ActiveRecord::Base.connection.add_foreign_key(School.table_name, :default_grade_system_id, GradeSystem.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, :school_id, School.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, :parent_id, GradeSystem.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, :profile_id, Profile.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, :building_id, Building.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, :school_id, School.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(ClassUnit.table_name, :school_id, School.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(ClassUnit.table_name, :building_id, Building.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(ClassUnit.table_name, :mentor_id, Profile.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Building.table_name, :school_id, School.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(AcademicYear.table_name, :school_id, School.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(AcademicYear.table_name, :period_type_id, PeriodType.table_name, :id)
-        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, :publishing_house_id, PublishingHouse.table_name, :id)
-      end
-
-      it "should not raise an error" do
-        expect { dump_schema }.to_not raise_error
-      end
-
-      it "should dump each constraint after both related tables were defined" do
-        expect(dump_schema.scan(%r{add_foreign_key}m).count).to eq 1
-        expect(dump_schema).to match(%r{create_table "schools".*add_foreign_key\s+"schools".*\["default_grade_system_id"\], "grade_systems", \["id"\]}m)
-        expect(dump_schema).to match(%r{create_table "grade_systems".*add_foreign_key\s+"schools".*\["default_grade_system_id"\], "grade_systems", \["id"\]}m)
-      end
+      expect(dump_schema).to match(%r{create_table "comments"(.|\n)*first_comment_id.*foreign_key.*comments})
+      expect(dump_schema).to match(%r{create_table "posts"(.|\n)*first_post_id.*foreign_key.*posts})
+      expect(dump_schema).to match(%r{create_table "posts"(.|\n)*add_foreign_key.*posts.*post_id})
+      expect(dump_schema).to match(%r{create_table "users"(.|\n)*add_foreign_key.*users.*commenter_id})
+      expect(dump_schema).to match(%r{create_table "users"(.|\n)*foreign_key.*users.*user_id})
     end
-  end
-
-  context 'with enum', :postgresql => :only do
-    let(:connection) { ActiveRecord::Base.connection }
 
-    it 'should include enum' do
-      begin
-        connection.execute "CREATE TYPE color AS ENUM ('red', 'green', 'blue')"
-        expect(dump_schema).to match(%r{create_enum "color", "red", "green", "blue"})
-      ensure
-        connection.execute "DROP TYPE color"
-      end
-    end
-
-    it 'should include enum with schema' do
-      begin
-        connection.execute "CREATE SCHEMA cmyk; CREATE TYPE cmyk.color AS ENUM ('cyan', 'magenta', 'yellow', 'black')"
-        expect(dump_schema).to match(%r{create_enum "color", "cyan", "magenta", "yellow", "black", :schema => "cmyk"})
-      ensure
-        connection.execute "DROP SCHEMA cmyk CASCADE"
-      end
+    it "should dump comments for delayed constraint definitions" do
+      expect(dump_schema).to match(%r{"post_id".*# foreign key references "posts"})
+      expect(dump_schema).to match(%r{"commenter_id".*# foreign key references "users"})
+      expect(dump_schema).to match(%r{"user_id".*# foreign key references "users"})
     end
   end
 
@@ -404,19 +133,6 @@ describe "Schema dump" do
     Regexp.new(Regexp.escape(string))
   end
 
-  def with_additional_column(model, column_name, column_type, options)
-    table_columns = model.columns.reject{|column| column.name == 'id'}
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
-        table_columns.each do |column|
-          t.column column.name, column.type, :default => column.default
-        end
-        t.column column_name, column_type, options
-      end
-    end
-    yield
-  end
-
   def with_foreign_key(model, columns, referenced_table_name, referenced_columns, options = {}, &block)
     with_foreign_keys(model, [[columns, referenced_table_name, referenced_columns, options]], &block)
   end
@@ -429,7 +145,7 @@ describe "Schema dump" do
           t.column column.name, column.type
         end
         columnsets.each do |columns, referenced_table_name, referenced_columns, options|
-          t.foreign_key columns, referenced_table_name, referenced_columns, options || {}
+          t.foreign_key columns, referenced_table_name, (options||{}).merge(column: referenced_columns)
         end
       end
     end
@@ -447,30 +163,9 @@ describe "Schema dump" do
     end
   end
 
-  def with_index(model, columns, options = {})
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.add_index(model.table_name, columns, options)
-    end
-    model.reset_column_information
-    begin
-      yield
-    ensure
-      ActiveRecord::Migration.suppress_messages do
-        ActiveRecord::Migration.remove_index(model.table_name, :name => determine_index_name(model, columns, options))
-      end
-    end
-  end
-
-  def determine_index_name(model, columns, options)
-    name = columns[:name] if columns.is_a?(Hash)
-    name ||= options[:name]
-    name ||= model.indexes.detect { |index| index.table == model.table_name.to_s && index.columns.sort == Array(columns).collect(&:to_s).sort }.name
-    name
-  end
-
   def determine_foreign_key_name(model, columns, options)
     name = options[:name]
-    name ||= model.foreign_keys.detect { |fk| fk.table_name == model.table_name.to_s && fk.column_names == Array(columns).collect(&:to_s) }.name
+    name ||= model.foreign_keys.detect { |fk| fk.from_table == model.table_name.to_s && Array.wrap(fk.column) == Array.wrap(columns).collect(&:to_s) }.name
   end
 
   def dump_schema(opts={})