schema_plus 2.0.0.pre2 → 2.0.0.pre3

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

@@ -1,25 +1,16 @@
-module SchemaPlus
+module SchemaPlusForeignKeys
   module Middleware
     module Dumper
 
-      def self.insert
-        SchemaMonkey::Middleware::Dumper::Tables.prepend FkDependencies
-        SchemaMonkey::Middleware::Dumper::Tables.append IgnoreActiveRecordFkDumps
-        SchemaMonkey::Middleware::Dumper::Table.append ForeignKeys
-      end
-
       # index and foreign key constraint definitions are dumped
       # inline in the create_table block.  (This is done for elegance, but
       # also because Sqlite3 does not allow foreign key constraints to be
       # added to a table after it has been defined.)
 
-      #
-      # Middleware for the collection of tables
-      #
+      module Tables
 
-      class FkDependencies < SchemaMonkey::Middleware::Base
+        def before(env)
 
-        def call(env)
           @inline_fks = Hash.new{ |h, k| h[k] = [] }
           @backref_fks = Hash.new{ |h, k| h[k] = [] }
 
@@ -39,10 +30,15 @@ module SchemaPlus
 
           env.dump.data.inline_fks = @inline_fks
           env.dump.data.backref_fks = @backref_fks
+        end
 
-          continue env
+        # Ignore the foreign key dumps at the end of the schema; we'll put them in/near their tables
+        def after(env)
+          env.dump.foreign_keys = []
         end
 
+        private
+
         def break_fk_cycles(env) #:nodoc:
           env.dump.strongly_connected_components.select{|component| component.size > 1}.each do |tables|
             table = tables.sort.first
@@ -54,22 +50,11 @@ module SchemaPlus
             end
           end
         end
-      end
 
-      class IgnoreActiveRecordFkDumps < SchemaMonkey::Middleware::Base
-        # Ignore the foreign key dumps at the end of the schema; we'll put them in/near their tables
-        def call(env)
-          continue env
-          env.dump.foreign_keys = []
-        end
       end
 
-      #
-      # Middleware for individual tables
-      #
-      class ForeignKeys < SchemaMonkey::Middleware::Base
-        def call(env)
-          continue env
+      module Table
+        def after(env)
           dumped = {}
           env.table.columns.each do |column|
             if (foreign_key = env.dump.data.inline_fks[env.table.name].find(&its.column.to_s == column.name))

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

@@ -1,14 +1,13 @@
-module SchemaPlus
+module SchemaPlusForeignKeys
   module Middleware
     module Migration
 
-      def self.insert
-        SchemaMonkey::Middleware::Migration::Column.prepend Shortcuts
-        SchemaMonkey::Middleware::Migration::Column.append AddForeignKeys
-      end
+      module Column
 
-      class Shortcuts < SchemaMonkey::Middleware::Base
-        def call(env)
+        #
+        # Column option shortcuts
+        #
+        def before(env)
           fk_options = env.options[:foreign_key]
 
           case fk_options
@@ -37,14 +36,12 @@ module SchemaPlus
           fk_options = false if fk_options and fk_options.has_key?(:references) and not fk_options[:references]
 
           env.options[:foreign_key] = fk_options
-
-          continue env
-
         end
-      end
 
-      class AddForeignKeys < SchemaMonkey::Middleware::Base
-        def call(env)
+        #
+        # Add the foreign keys
+        #
+        def around(env)
           options = env.options
           original_options = options.dup
 
@@ -56,7 +53,7 @@ module SchemaPlus
           index = options.delete(:index) unless is_polymorphic
           options[:foreign_key] = false if is_reference
 
-          continue env
+          yield env
 
           return if is_polymorphic
 
@@ -66,13 +63,15 @@ module SchemaPlus
 
         end
 
+        private
+
         def add_foreign_keys_and_auto_index(env)
 
           if (reverting = env.caller.is_a?(::ActiveRecord::Migration::CommandRecorder) && env.caller.reverting)
             commands_length = env.caller.commands.length
           end
 
-          config = (env.caller.try(:schema_plus_config) || SchemaPlus.config).foreign_keys
+          config = (env.caller.try(:schema_plus_config) || SchemaPlusForeignKeys.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/middleware/model.rb

@@ -0,0 +1,15 @@
+module SchemaPlusForeignKeys
+  module Middleware
+
+    module Model
+      module ResetColumnInformation
+
+        def after(env)
+          env.model.reset_foreign_key_information
+        end
+
+      end
+    end
+
+  end
+end

data/lib/schema_plus_foreign_keys/version.rb

@@ -0,0 +1,3 @@
+module SchemaPlusForeignKeys
+  VERSION = "0.1.0"
+end

data/lib/schema_plus_views.rb

@@ -0,0 +1,16 @@
+require 'schema_monkey'
+
+require_relative 'schema_plus_views/active_record/connection_adapters/abstract_adapter'
+require_relative 'schema_plus_views/middleware'
+
+module SchemaPlusViews
+  module ActiveRecord
+    module ConnectionAdapters
+      autoload :Mysql2Adapter, 'schema_plus_views/active_record/connection_adapters/mysql2_adapter'
+      autoload :PostgresqlAdapter, 'schema_plus_views/active_record/connection_adapters/postgresql_adapter'
+      autoload :Sqlite3Adapter, 'schema_plus_views/active_record/connection_adapters/sqlite3_adapter'
+    end
+  end
+end
+
+SchemaMonkey.register(SchemaPlusViews)

data/lib/{schema_views → schema_plus_views}/active_record/connection_adapters/abstract_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaViews
+module SchemaPlusViews
   module ActiveRecord
     module ConnectionAdapters
       module AbstractAdapter

data/lib/{schema_views → schema_plus_views}/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaViews
+module SchemaPlusViews
   module ActiveRecord
     module ConnectionAdapters
       module Mysql2Adapter

data/lib/{schema_views → schema_plus_views}/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaViews
+module SchemaPlusViews
   module ActiveRecord
     module ConnectionAdapters
       module PostgresqlAdapter

data/lib/{schema_views → schema_plus_views}/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaViews
+module SchemaPlusViews
   module ActiveRecord
     module ConnectionAdapters
       module Sqlite3Adapter

data/lib/schema_plus_views/middleware.rb

@@ -0,0 +1,49 @@
+module SchemaPlusViews
+  module Middleware
+
+    module Dumper
+      module Tables
+
+        # Dump views
+        def after(env)
+          re_view_referent = %r{(?:(?i)FROM|JOIN) \S*\b(\S+)\b}
+          env.connection.views.each do |view_name|
+            next if env.dumper.ignored?(view_name)
+            view = View.new(name: view_name, definition: env.connection.view_definition(view_name))
+            env.dump.tables[view.name] = view
+            env.dump.depends(view.name, view.definition.scan(re_view_referent).flatten)
+          end
+        end
+
+        # quacks like a SchemaMonkey Dump::Table
+        class View < KeyStruct[:name, :definition]
+          def assemble(stream)
+            stream.puts("  create_view #{name.inspect}, #{definition.inspect}, :force => true\n")
+          end
+        end
+      end
+    end
+
+    module Query
+      module Tables
+
+        module Mysql
+          def after(env)
+            Tables.filter_out_views(env)
+          end
+        end
+
+        module Sqlite3
+          def after(env)
+            Tables.filter_out_views(env)
+          end
+        end
+
+        def self.filter_out_views(env)
+          env.tables -= env.connection.views(env.query_name)
+        end
+      end
+    end
+  end
+
+end

data/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
     - 1.9.3
     - 2.1.5
-rails:
+activerecord:
     - 4.2
 db:
     - mysql2

data/schema_plus.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activerecord", "~> 4.2"
   s.add_dependency "valuable"
-  s.add_dependency "schema_monkey", "~> 0.4"
+  s.add_dependency "schema_monkey", "~> 1.0", ">= 1.0.1"
+  s.add_dependency "schema_monkey_rails", "~> 0.1", ">= 0.1.1"
   s.add_dependency "schema_plus_indexes", "~> 0.1"
   s.add_dependency "schema_plus_pg_indexes", "~> 0.1"
 
-  s.add_development_dependency "schema_dev", "~> 2.0", ">= 2.0.3"
+  s.add_development_dependency "schema_dev", "~> 3.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.0.0"
   s.add_development_dependency "rdoc"

data/spec/{schema_db_default → schema_plus_db_default}/column_spec.rb

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

data/spec/schema_plus_default_expr/migration_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe ActiveRecord::Migration do
+
+  before(:each) do
+    define_schema(:auto_create => true) do
+      create_table :posts, :force => true do |t|
+        t.string :content
+      end
+    end
+    class Post < ::ActiveRecord::Base ; end
+  end
+
+  context "when table is created" do
+
+    before(:each) do
+      @model = Post
+    end
+
+    it "should properly handle default values for booleans" do
+      expect {
+        recreate_table(@model) do |t|
+          t.boolean :bool, :default => true
+        end
+      }.to_not raise_error
+      expect(@model.create.reload.bool).to be true
+    end
+
+    it "should properly handle default values for json (#195)", :postgresql => :only do
+      recreate_table(@model) do |t|
+        t.json :json, :default => {}
+      end
+      expect(@model.create.reload.json).to eq({})
+    end
+
+  end
+
+  def recreate_table(model, opts={}, &block)
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.create_table model.table_name, opts.merge(:force => true), &block
+    end
+    model.reset_column_information
+  end
+end

data/spec/{schema_default_expr → schema_plus_default_expr}/schema_dumper_spec.rb

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

data/spec/{foreign_key_spec.rb → schema_plus_foreign_keys/foreign_key_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "Foreign Key" do
 
@@ -32,7 +32,7 @@ describe "Foreign Key" do
   context "with modifications to SQL generated by upstream visit_TableDefinition" do
     before(:each) do
       allow_any_instance_of(ActiveRecord::Base.connection.class.const_get(:SchemaCreation))
-      .to receive(:visit_TableDefinition_without_schema_plus)
+      .to receive(:visit_TableDefinition_without_schema_plus_foreign_keys)
       .and_return('this is unexpected')
     end
 

data/spec/{migration_spec.rb → schema_plus_foreign_keys/migration_spec.rb}

@@ -40,22 +40,6 @@ describe ActiveRecord::Migration do
       @model = Post
     end
 
-    it "should properly handle default values for booleans" do
-      expect {
-        recreate_table(@model) do |t|
-          t.boolean :bool, :default => true
-        end
-      }.to_not raise_error
-      expect(@model.create.reload.bool).to be true
-    end
-
-    it "should properly handle default values for json (#195)", :postgresql => :only do
-      recreate_table(@model) do |t|
-        t.json :json, :default => {}
-      end
-      expect(@model.create.reload.json).to eq({})
-    end if ActiveRecord::VERSION::MAJOR >= 4
-
     it "should create auto foreign keys" do
       recreate_table(@model) do |t|
         t.integer :user_id
@@ -520,53 +504,53 @@ describe ActiveRecord::Migration do
     end
 
     it "should auto-index if specified in global options" do
-      SchemaPlus.config.foreign_keys.auto_index = true
+      SchemaPlusForeignKeys.config.auto_index = true
       add_column(:post_id, :integer) do
         expect(@model).to have_index.on(:post_id)
       end
-      SchemaPlus.config.foreign_keys.auto_index = false
+      SchemaPlusForeignKeys.config.auto_index = false
     end
 
     it "should auto-index foreign keys only" do
-      SchemaPlus.config.foreign_keys.auto_index = true
+      SchemaPlusForeignKeys.config.auto_index = true
       add_column(:state, :integer) do
         expect(@model).not_to have_index.on(:state)
       end
-      SchemaPlus.config.foreign_keys.auto_index = false
+      SchemaPlusForeignKeys.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
-      SchemaPlus.config.foreign_keys.auto_index = true
+      SchemaPlusForeignKeys.config.auto_index = true
       add_column(:post_id, :integer, :index => false) do
         expect(@model).not_to have_index.on(:post_id)
       end
-      SchemaPlus.config.foreign_keys.auto_index = false
+      SchemaPlusForeignKeys.config.auto_index = false
     end
 
     it "should use default on_update action" do
-      SchemaPlus.config.foreign_keys.on_update = :cascade
+      SchemaPlusForeignKeys.config.on_update = :cascade
       add_column(:post_id, :integer) do
         expect(@model).to reference.on(:post_id).on_update(:cascade)
       end
-      SchemaPlus.config.foreign_keys.on_update = nil
+      SchemaPlusForeignKeys.config.on_update = nil
     end
 
     it "should use default on_delete action" do
-      SchemaPlus.config.foreign_keys.on_delete = :cascade
+      SchemaPlusForeignKeys.config.on_delete = :cascade
       add_column(:post_id, :integer) do
         expect(@model).to reference.on(:post_id).on_delete(:cascade)
       end
-      SchemaPlus.config.foreign_keys.on_delete = nil
+      SchemaPlusForeignKeys.config.on_delete = nil
     end
 
     it "should allow to overwrite default actions" do
-      SchemaPlus.config.foreign_keys.on_delete = :cascade
-      SchemaPlus.config.foreign_keys.on_update = :restrict
+      SchemaPlusForeignKeys.config.on_delete = :cascade
+      SchemaPlusForeignKeys.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
-      SchemaPlus.config.foreign_keys.on_delete = nil
+      SchemaPlusForeignKeys.config.on_delete = nil
     end
 
     protected