schema_plus 2.0.0.pre5 → 2.0.0.pre6

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,7 +1,7 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module ActiveRecord
     module ConnectionAdapters
-      # SchemaPlusForeignKeys includes a MySQL implementation of the AbstractAdapter
+      # SchemaPlus::ForeignKeys includes a MySQL implementation of the AbstractAdapter
       # extensions.
       module Mysql2Adapter
 

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,8 +1,8 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module ActiveRecord
     module ConnectionAdapters
 
-      # The Postgresql adapter implements the SchemaPlusForeignKeys extensions and
+      # The Postgresql adapter implements the SchemaPlus::ForeignKeys extensions and
       # enhancements
       module PostgresqlAdapter
 

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,8 +1,8 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module ActiveRecord
     module ConnectionAdapters
 
-      # SchemaPlusForeignKeys includes an Sqlite3 implementation of the AbstractAdapter
+      # SchemaPlus::ForeignKeys includes an Sqlite3 implementation of the AbstractAdapter
       # extensions.
       module Sqlite3Adapter
 

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/active_record/connection_adapters/table_definition.rb

@@ -1,19 +1,19 @@
-module SchemaPlusForeignKeys::ActiveRecord::ConnectionAdapters
+module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
 
   #
-  # SchemaPlusForeignKeys adds several methods to TableDefinition, allowing indexes
+  # SchemaPlus::ForeignKeys adds several methods to TableDefinition, allowing indexes
   # and foreign key constraints to be defined within a
   # <tt>create_table</tt> block of a migration, allowing for better
   # encapsulation and more DRY definitions.
   #
-  # For example, without SchemaPlusForeignKeys you might define a table like this:
+  # For example, without SchemaPlus::ForeignKeys you might define a table like this:
   #
   #    create_table :widgets do |t|
   #       t.string :name
   #    end
   #    add_index :widgets, :name
   #
-  # But with SchemaPlusForeignKeys, the index can be defined within the create_table
+  # But with SchemaPlus::ForeignKeys, the index can be defined within the create_table
   # block, so you don't need to repeat the table name:
   #
   #    create_table :widgets do |t|
@@ -31,7 +31,7 @@ module SchemaPlusForeignKeys::ActiveRecord::ConnectionAdapters
   # For details about the :index option (including unique and multi-column indexes), see the
   # documentation for Migration::ClassMethods#add_column
   #
-  # SchemaPlusForeignKeys also supports creation of foreign key constraints analogously, using Migration::ClassMethods#add_foreign_key or TableDefinition#foreign_key or as part of the column definition, for example:
+  # SchemaPlus::ForeignKeys also supports creation of foreign key constraints analogously, using Migration::ClassMethods#add_foreign_key or TableDefinition#foreign_key or as part of the column definition, for example:
   #
   #    create_table :posts do |t|  # not DRY
   #       t.integer :author_id
@@ -47,13 +47,13 @@ module SchemaPlusForeignKeys::ActiveRecord::ConnectionAdapters
   #       t.integer :author_id, :foreign_key => true
   #    end
   #
-  # <b>NOTE:</b> In the standard configuration, SchemaPlusForeignKeys automatically
+  # <b>NOTE:</b> In the standard configuration, SchemaPlus::ForeignKeys automatically
   # creates foreign key constraints for columns whose names end in
   # <tt>_id</tt>.  So the above examples are redundant, unless automatic
   # creation was disabled at initialization in the global Config.
   #
-  # SchemaPlusForeignKeys likewise by default automatically creates foreign key constraints for
-  # columns defined via <tt>t.references</tt>.   However, SchemaPlusForeignKeys does not create
+  # SchemaPlus::ForeignKeys likewise by default automatically creates foreign key constraints for
+  # columns defined via <tt>t.references</tt>.   However, SchemaPlus::ForeignKeys does not create
   # foreign key constraints if the <tt>:polymorphic</tt> option is true
   #
   # Finally, the configuration for foreign keys can be overriden on a per-table

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/active_record/migration/command_recorder.rb

@@ -1,4 +1,4 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module ActiveRecord
     module Migration
       module CommandRecorder

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/active_record/schema.rb

@@ -1,16 +1,16 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module ActiveRecord
     module Schema
       module ClassMethods
 
         def define(*args)
           fk_override = { :auto_create => false, :auto_index => false }
-          save = Hash[fk_override.keys.collect{|key| [key, SchemaPlusForeignKeys.config.send(key)]}]
+          save = Hash[fk_override.keys.collect{|key| [key, SchemaPlus::ForeignKeys.config.send(key)]}]
           begin
-            SchemaPlusForeignKeys.config.update_attributes(fk_override)
+            SchemaPlus::ForeignKeys.config.update_attributes(fk_override)
             super
           ensure
-            SchemaPlusForeignKeys.config.update_attributes(save)
+            SchemaPlus::ForeignKeys.config.update_attributes(save)
           end
         end
       end

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/middleware/dumper.rb

@@ -1,4 +1,4 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module Middleware
     module Dumper
 
@@ -41,7 +41,7 @@ module SchemaPlusForeignKeys
 
         def break_fk_cycles(env) #:nodoc:
           env.dump.strongly_connected_components.select{|component| component.size > 1}.each do |tables|
-            table = tables.sort.first
+            table = tables.sort.last
             backref_fks = @inline_fks[table].select{|fk| tables.include?(fk.to_table)}
             @inline_fks[table] -= backref_fks
             env.dump.dependencies[table] -= backref_fks.collect(&:to_table)

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/middleware/migration.rb

@@ -1,4 +1,4 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module Middleware
     module Migration
 
@@ -71,7 +71,7 @@ module SchemaPlusForeignKeys
             commands_length = env.caller.commands.length
           end
 
-          config = (env.caller.try(:schema_plus_config) || SchemaPlusForeignKeys.config)
+          config = (env.caller.try(:schema_plus_config) || SchemaPlus::ForeignKeys.config)
           fk_args = get_fk_args(env, config)
 
           # remove existing fk and auto-generated index in case of change of fk on existing column

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/middleware/model.rb

@@ -1,4 +1,4 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module Middleware
 
     module Model

data/lib/{schema_plus_foreign_keys → schema_plus/foreign_keys}/middleware/sql.rb

@@ -1,4 +1,4 @@
-module SchemaPlusForeignKeys
+module SchemaPlus::ForeignKeys
   module Middleware
     module Sql
       module Table

data/lib/schema_plus/foreign_keys/version.rb

@@ -0,0 +1,3 @@
+module SchemaPlus::ForeignKeys
+  VERSION = "0.1.0"
+end

data/lib/schema_plus/tables.rb

@@ -0,0 +1,15 @@
+require 'schema_plus/core'
+
+require_relative 'tables/active_record/connection_adapters/abstract_adapter'
+
+module SchemaPlus::Tables
+  module ActiveRecord
+    module ConnectionAdapters
+      autoload :Mysql2Adapter, 'schema_plus/tables/active_record/connection_adapters/mysql2_adapter'
+      autoload :PostgresqlAdapter, 'schema_plus/tables/active_record/connection_adapters/postgresql_adapter'
+      autoload :Sqlite3Adapter, 'schema_plus/tables/active_record/connection_adapters/sqlite3_adapter'
+    end
+  end
+end
+
+SchemaMonkey.register SchemaPlus::Tables

data/lib/{schema_plus_tables → schema_plus/tables}/active_record/connection_adapters/abstract_adapter.rb

@@ -1,8 +1,8 @@
-module SchemaPlusTables
+module SchemaPlus::Tables
   module ActiveRecord
     module ConnectionAdapters
       module AbstractAdapter
-        
+
         # Extends rails' drop_table to include these options:
         #   :cascade
         #   :if_exists

data/lib/{schema_plus_tables → schema_plus/tables}/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,8 +1,8 @@
-module SchemaPlusTables
+module SchemaPlus::Tables
   module ActiveRecord
     module ConnectionAdapters
       module Mysql2Adapter
-        
+
         # implement cascade by removing foreign keys
         def drop_table(name, options={})
           if options[:cascade]

data/lib/{schema_plus_tables → schema_plus/tables}/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,11 +1,11 @@
-module SchemaPlusTables
+module SchemaPlus::Tables
   module ActiveRecord
     module ConnectionAdapters
       module PostgresqlAdapter
         # pg gem defines a drop_table with fewer options than our Abstract
         # one, so use the abstract one instead
         def drop_table(name, options={})
-          SchemaPlusTables::ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_method(:drop_table).bind(self).call(name, options)
+          SchemaPlus::Tables::ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_method(:drop_table).bind(self).call(name, options)
         end
       end
     end

data/lib/{schema_plus_tables → schema_plus/tables}/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaPlusTables
+module SchemaPlus::Tables
   module ActiveRecord
     module ConnectionAdapters
       module Sqlite3Adapter

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre5"
+  VERSION = "2.0.0.pre6"
 end

data/schema_plus.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "valuable"
   gem.add_dependency "schema_plus_core", "~> 0.1"
   gem.add_dependency "schema_monkey_rails", "~> 0.1", ">= 0.1.2"
-  gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.2"
+  gem.add_dependency "schema_plus_columns", "~> 0.1"
+  gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
   gem.add_dependency "schema_plus_pg_indexes", "~> 0.1", ">= 0.1.3"
   gem.add_dependency "schema_plus_views", "~> 0.1"
 

data/spec/schema_plus_db_default/column_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SchemaPlusDbDefault do
+describe SchemaPlus::DbDefault do
 
   let(:migration) { ::ActiveRecord::Migration }
 

data/spec/schema_plus_default_expr/schema_dumper_spec.rb

@@ -4,7 +4,7 @@ require 'stringio'
 describe "Schema dump" do
 
   before(:all) do
-    SchemaPlusForeignKeys.setup do |config|
+    SchemaPlus::ForeignKeys.setup do |config|
       config.auto_create = false
     end
     ActiveRecord::Migration.suppress_messages do

data/spec/schema_plus_foreign_keys/migration_spec.rb

@@ -504,53 +504,53 @@ describe ActiveRecord::Migration do
     end
 
     it "should auto-index if specified in global options" do
-      SchemaPlusForeignKeys.config.auto_index = true
+      SchemaPlus::ForeignKeys.config.auto_index = true
       add_column(:post_id, :integer) do
         expect(@model).to have_index.on(:post_id)
       end
-      SchemaPlusForeignKeys.config.auto_index = false
+      SchemaPlus::ForeignKeys.config.auto_index = false
     end
 
     it "should auto-index foreign keys only" do
-      SchemaPlusForeignKeys.config.auto_index = true
+      SchemaPlus::ForeignKeys.config.auto_index = true
       add_column(:state, :integer) do
         expect(@model).not_to have_index.on(:state)
       end
-      SchemaPlusForeignKeys.config.auto_index = false
+      SchemaPlus::ForeignKeys.config.auto_index = false
     end
 
     # MySQL creates an index on foreign key and we can't override that
     it "should allow to overwrite auto_index options in column definition", :mysql => :skip do
-      SchemaPlusForeignKeys.config.auto_index = true
+      SchemaPlus::ForeignKeys.config.auto_index = true
       add_column(:post_id, :integer, :index => false) do
         expect(@model).not_to have_index.on(:post_id)
       end
-      SchemaPlusForeignKeys.config.auto_index = false
+      SchemaPlus::ForeignKeys.config.auto_index = false
     end
 
     it "should use default on_update action" do
-      SchemaPlusForeignKeys.config.on_update = :cascade
+      SchemaPlus::ForeignKeys.config.on_update = :cascade
       add_column(:post_id, :integer) do
         expect(@model).to reference.on(:post_id).on_update(:cascade)
       end
-      SchemaPlusForeignKeys.config.on_update = nil
+      SchemaPlus::ForeignKeys.config.on_update = nil
     end
 
     it "should use default on_delete action" do
-      SchemaPlusForeignKeys.config.on_delete = :cascade
+      SchemaPlus::ForeignKeys.config.on_delete = :cascade
       add_column(:post_id, :integer) do
         expect(@model).to reference.on(:post_id).on_delete(:cascade)
       end
-      SchemaPlusForeignKeys.config.on_delete = nil
+      SchemaPlus::ForeignKeys.config.on_delete = nil
     end
 
     it "should allow to overwrite default actions" do
-      SchemaPlusForeignKeys.config.on_delete = :cascade
-      SchemaPlusForeignKeys.config.on_update = :restrict
+      SchemaPlus::ForeignKeys.config.on_delete = :cascade
+      SchemaPlus::ForeignKeys.config.on_update = :restrict
       add_column(:post_id, :integer, :foreign_key => { :on_update => :nullify, :on_delete => :nullify}) do
         expect(@model).to reference.on(:post_id).on_delete(:nullify).on_update(:nullify)
       end
-      SchemaPlusForeignKeys.config.on_delete = nil
+      SchemaPlus::ForeignKeys.config.on_delete = nil
     end
 
     protected

data/spec/schema_plus_foreign_keys/schema_dumper_spec.rb

@@ -4,7 +4,7 @@ require 'stringio'
 describe "Schema dump" do
 
   before(:all) do
-    SchemaPlusForeignKeys.setup do |config|
+    SchemaPlus::ForeignKeys.setup do |config|
       config.auto_create = false
     end
     ActiveRecord::Migration.suppress_messages do
@@ -113,18 +113,85 @@ describe "Schema dump" do
       expect { dump_schema }.to_not raise_error
     end
 
-    it "should dump constraints after the tables they reference" do
-      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})
+    ["comments", "posts", "users"].each do |table|
+      it "should dump constraints for table #{table.inspect} after the table definition" do
+        dump = dump_schema.gsub(/#[^\n*]/m, '')
+        expect(dump =~ %r{create_table "#{table}"}).to be < (dump =~ %r{foreign_key.*"#{table}"})
+      end
+    end
+
+    ["comments", "posts"].each do |table|
+      qtable = table.inspect
+      it "should dump comments for delayed constraint definition referencing table #{qtable}" do
+        expect(dump_schema).to match(%r{# foreign key references #{qtable}.*create_table #{qtable}.*add_foreign_key \S+, #{qtable}}m)
+      end
     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"})
+    context 'with complicated schemas' do
+      before(:all) do
+
+        SchemaPlus::ForeignKeys.setup do |config|
+          config.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 :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
+            end
+
+            create_table :buildings, force: true do |t|
+              t.string   :name
+              t.integer  :school_id
+            end
+
+            create_table :profiles, force: true do |t|
+              t.integer  :school_id
+              t.integer  :building_id
+            end
+
+          end
+        end
+
+        class ::AcademicYear < ActiveRecord::Base ; end
+        class ::Building < ActiveRecord::Base ; end
+        class ::GradeSystem < ActiveRecord::Base ; end
+        class ::Profile < ActiveRecord::Base ; end
+        class ::School < ActiveRecord::Base ; end
+
+        ActiveRecord::Base.connection.add_foreign_key(School.table_name, GradeSystem.table_name, column: :default_grade_system_id)
+        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, School.table_name, column: :school_id)
+        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, GradeSystem.table_name, column: :parent_id)
+        ActiveRecord::Base.connection.add_foreign_key(GradeSystem.table_name, Profile.table_name, column: :profile_id)
+        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, Building.table_name, column: :building_id)
+        ActiveRecord::Base.connection.add_foreign_key(Profile.table_name, School.table_name, column: :school_id)
+        ActiveRecord::Base.connection.add_foreign_key(Building.table_name, School.table_name, column: :school_id)
+        ActiveRecord::Base.connection.add_foreign_key(AcademicYear.table_name, School.table_name, column: :school_id)
+      end
+
+      it "should not raise an error" do
+        expect { dump_schema }.to_not raise_error
+      end
+
+      ["buildings", "grade_systems", "profiles", "schools"].each do |table|
+        it "should dump constraints for table #{table.inspect} after the table definition" do
+          expect(dump_schema =~ %r{create_table "#{table}"}).to be < (dump_schema =~ %r{foreign_key.*"#{table}"})
+        end
+      end
     end
   end
 

data/spec/schema_plus_foreign_keys/schema_spec.rb

@@ -77,22 +77,22 @@ describe ActiveRecord::Schema do
 
 
   def with_auto_index(value = true)
-    old_value = SchemaPlusForeignKeys.config.auto_index
-    SchemaPlusForeignKeys.config.auto_index = value
+    old_value = SchemaPlus::ForeignKeys.config.auto_index
+    SchemaPlus::ForeignKeys.config.auto_index = value
     begin
       yield
     ensure
-      SchemaPlusForeignKeys.config.auto_index = old_value
+      SchemaPlus::ForeignKeys.config.auto_index = old_value
     end
   end
 
   def with_auto_create(value = true)
-    old_value = SchemaPlusForeignKeys.config.auto_create
-    SchemaPlusForeignKeys.config.auto_create = value
+    old_value = SchemaPlus::ForeignKeys.config.auto_create
+    SchemaPlus::ForeignKeys.config.auto_create = value
     begin
       yield
     ensure
-      SchemaPlusForeignKeys.config.auto_create = old_value
+      SchemaPlus::ForeignKeys.config.auto_create = old_value
     end
   end