schema_plus_core 1.0.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467fc076aa3de1e9d6890f4a9ff8e87a81a24c3f
-  data.tar.gz: 9e35f0a5d5be71a5a53c6aba151d3140c140f387
+  metadata.gz: 86e2ba87b085b72dbc2117b25926b21cd17c900f
+  data.tar.gz: 3449adbeb2caf2405162f70aab282a117aa81260
 SHA512:
-  metadata.gz: 1481e4d731796f2a2db9bce577a115313bd67d489a4a53b9dc24fbd71c38e554f247ddb4aaa02d5148156ed491cc8be64956367541901549df50cc7a4300519d
-  data.tar.gz: 7e1d8b4995d2482e8b3efda83e608b7e7b5c313c5f33d6264cb743ce0467f23b542c756be4482ec8a7af052b3cd9aa086be71cdc7dfeb72614cb068ef8975ee7
+  metadata.gz: f9972320f4d103ed11fb2a2f4e2951d95b47b8212bf9d30f31b61ca0edf137abc01d6590c338a2425922144483848dcf3677378c3d5bff05f4418d316d973d70
+  data.tar.gz: 8c2a28d46bd37562699a33e5a690c8cfd38cce492693bb08bde076ff2b06ce691f12e101d8f9f6f8bb913006524a598415259183c7d02520b7e17845b88d7f5c

data/.travis.yml

@@ -5,11 +5,11 @@
 ---
 sudo: false
 rvm:
-- 2.1.5
+- 2.3.0
 gemfile:
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -6,11 +6,11 @@
 
 SchemaPlus::Core creates an internal extension API to ActiveRecord.  The idea is that:
 
-* ShemaPlus::Core does the monkey-patching so clients don't have to know too much about the internal of ActiveRecord.
+* SchemaPlus::Core does the monkey-patching so clients don't have to know too much about the internal of ActiveRecord.
 
 * SchemaPlus::Core's extension API is consistent across the various connection adapters, so clients don't have to figure out how to extend each connection adapter independently.
 
-* SchemPlus::Core's extension API intends to remain reasonably stable even as ActiveRecord changes.
+* SchemaPlus::Core's extension API intends to remain reasonably stable even as ActiveRecord changes.
 
 By itself, SchemaPlus::Core does not change any behavior or add any external features to ActiveRecord.  It just makes the API available to clients.
 
@@ -23,10 +23,19 @@ SchemaPlus::Core is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.0** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
+<aside class="warning">
+As of version 2.0.0, `schema_plus_core` supports only ActiveRecord >= 5.0.
+ActiveRecord 4.2.x is supported in version 1.x, maintained in the 1.x
+branch.
+
+### Breaking changes in version 2.0 ###
+
+* `SchemaPlus::Core::Schema::Tables` middleware was replaced by `SchemaPlus::Core::DataSources`. Parameters have also changed.
+* `SchemaPlus::Core::Dumper::Indexes` middleware was removed; instead `SchemaPlus::Core::Dumper::Table` sets both columns and indexes on env.table.
 
 ## Installation
 
@@ -112,27 +121,23 @@ Stacks for general operations queries pertaining to the entire database schema:
 
   Wrapper around the `connection.indexes(table_name)` method.  Env contains:
 
-    Env Field    | Description | Initial value
-    --- | --- | ---
-    `:index_definitions` | The result of the lookup | `[]`
-    `:connection` | The current ActiveRecord connection | *context*
-    `:table_name` | The name of the table to query | *arg*
-    `:query_name` | Label sometimes used by ActiveRecord logging | *arg*
+    Env Field            | Description                                  | Initial value
+    -------------------- | -------------------------------------------- | -------------
+    `:index_definitions` | The result of the lookup                     | `[]`
+    `:connection`        | The current ActiveRecord connection          | *context*
+    `:table_name`        | The name of the table to query               | *arg*
+    `:query_name`        | Label sometimes used by ActiveRecord logging | *arg*
 
   The base implementation appends its results to `env.index_definitions`
 
-* `Schema::Tables`
+* `Schema::DataSources`
 
-  Wrapper around the `connection.tables()` method.  Env contains:
+  Wrapper around the `connection.data_sources()` method.  Env contains:
 
-    Env Field    | Description | Initialized
-    --- | --- | ---
-    `:tables`     | The result of the lookup | `[]`
-    `:connection` | The current ActiveRecord connection | *context*
-    `:table_name` | (SQlite3 only) | *arg*
-    `:database`   | (Mysql only) | *arg*
-    `:like`       | (Mysql only) | *arg*
-    `:query_name` | Label sometimes used by ActiveRecord logging | *arg*
+    Env Field       | Description                                  | Initialized
+    --------------- | -------------------------------------------- | -----------
+    `:data_sources` | The result of the lookup                     | `[]`
+    `:connection`   | The current ActiveRecord connection          | *context*
 
   The base implementation appends its results to `env.tables`
 
@@ -393,12 +398,12 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
   Callback stack wraps the creation of initial statements for the dump.
 
-      Env Field    | Description | Initialized
-    --- | --- | ---
-    `:initial` | The initial statements | []
-    `:dump`    | The SchemaDump object | *context*
-    `:dumper`  | The current ActiveRecord::SchemaDumper instance| *context*
-    `:connection`      | The current ActiveRecord connection | *context*
+    Env Field     | Description                                     | Initialized
+    ---           | ---                                             | ---
+    `:initial`    | The initial statements                          | []
+    `:dump`       | The SchemaDump object                           | *context*
+    `:dumper`     | The current ActiveRecord::SchemaDumper instance | *context*
+    `:connection` | The current ActiveRecord connection             | *context*
 
   The base method appends initial statements to `env.initial`.
 
@@ -406,11 +411,11 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
   Callback stack wraps the dumping of all tables.
 
-      Env Field    | Description | Initialized
-    --- | --- | ---
-    `:dump`    | The SchemaDump object | *context*
-    `:dumper`  | The current ActiveRecord::SchemaDumper instance| *context*
-    `:connection`      | The current ActiveRecord connection | *context*
+    Env Field     | Description                                     | Initialized
+    ---           | ---                                             | ---
+    `:dump`       | The SchemaDump object                           | *context*
+    `:dumper`     | The current ActiveRecord::SchemaDumper instance | *context*
+    `:connection` | The current ActiveRecord connection             | *context*
 
   The base method iterates through all tables, dumping each.
 
@@ -419,33 +424,24 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
   Callback stack wraps the dumping of each table
 
-      Env Field    | Description | Initialized
-    --- | --- | ---
-    `:table` | A SchemaDump::Table object| `table.name` *only*
-    `:dump`    | The SchemaDump object | *context*
-    `:dumper`  | The current ActiveRecord::SchemaDumper instance| *context*
-    `:connection`      | The current ActiveRecord connection | *context*
+    Env Field     | Description                                     | Initialized
+    ---           | ---                                             | ---
+    `:table`      | A SchemaDump::Table object                      | `table.name` *only*
+    `:dump`       | The SchemaDump object                           | *context*
+    `:dumper`     | The current ActiveRecord::SchemaDumper instance | *context*
+    `:connection` | The current ActiveRecord connection             | *context*
 
   The base method iterates through all columns and indexes of the table, and *overwrites* the contents of `table`,
 
   Notes:
 
   1. When the stack is called, `env.dump.tables[env.table.name]` contains the `env.table` object.
-
-* `Dumper::Indexes`
-
-  Callback stack wraps the dumping of the indexes of a table
-
-      Env Field    | Description | Initialized
-    --- | --- | ---
-    `:table` | A SchemaDump::Table object| *context*
-    `:dump`    | The SchemaDump object | *context*
-    `:dumper`  | The current ActiveRecord::SchemaDumper instance| *context*
-    `:connection`      | The current ActiveRecord connection | *context*
-
-  The base method appends the collection of SchemaDump::Table::Index objects to `env.table.indexes`
+  2. The base method sets *both* `env.table.columns` and `env.tables.indexes`.
 
 ## History
+
+* 2.0.1 Tighten up AR dependency.  Thanks to [@myabc](https://github.com/myabc).
+* 2.0.0 Added AR5 support, removed AR4.2 support.  Thanks to [@boazy](https://github.com/boazy).
 * 1.0.2 Missing require
 * 1.0.1 Explicit gem dependencies
 * 1.0.0 Clean up `SchemaDump::Table::Column` and `SchemaDump::Table::Index` API:  `#options` is now a hash and `#comments` is now an array; no longer have `add_option` and `add_comment` methods.

data/gemfiles/{activerecord-4.2 → activerecord-5.0}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 4.2.6"
+gem "activerecord", ">= 5.0.0.beta1", "< 5.1"

data/gemfiles/{activerecord-4.2 → activerecord-5.0}/Gemfile.mysql2

@@ -2,7 +2,7 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "mysql2", '>= 0.3.18', '< 0.5'
+  gem "mysql2"
 end
 
 platform :jruby do

data/lib/schema_plus/core/active_record/connection_adapters/mysql2_adapter.rb

@@ -34,10 +34,10 @@ module SchemaPlus
             }.index_definitions
           end
 
-          def tables(query_name=nil, database=nil, like=nil)
-            SchemaMonkey::Middleware::Schema::Tables.start(connection: self, query_name: query_name, database: database, like: like, tables: []) { |env|
-              env.tables += super env.query_name, env.database, env.like
-            }.tables
+          def data_sources
+            SchemaMonkey::Middleware::Schema::DataSources.start(connection: self, sources: []) { |env|
+              env.sources += super
+            }.sources
           end
 
           def select_rows(sql, name=nil, binds=[])
@@ -46,9 +46,9 @@ module SchemaPlus
             }.result
           end
 
-          def exec_query(sql, name='SQL', binds=[])
-            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds) { |env|
-              env.result = super env.sql, env.query_name, env.binds
+          def exec_query(sql, name='SQL', binds=[], prepare: false)
+            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds, prepare: prepare) { |env|
+              env.result = super env.sql, env.query_name, env.binds, prepare: env.prepare
             }.result
           end
 

data/lib/schema_plus/core/active_record/connection_adapters/postgresql_adapter.rb

@@ -16,7 +16,7 @@ module SchemaPlus
           # expressions don't work well in AR anyway.  (hence
           # schema_plus_default_expr )
           #
-          def prepare_column_options(column, types) # :nodoc:
+          def prepare_column_options(column, *) # :nodoc:
             spec = super
             spec[:default] = "%q{#{column.default_function}}" if column.default_function
             spec
@@ -64,10 +64,10 @@ module SchemaPlus
             }.index_definitions
           end
 
-          def tables(query_name=nil)
-            SchemaMonkey::Middleware::Schema::Tables.start(connection: self, query_name: query_name, tables: []) { |env|
-              env.tables += super env.query_name
-            }.tables
+          def data_sources
+            SchemaMonkey::Middleware::Schema::DataSources.start(connection: self, sources: []) { |env|
+              env.sources += super
+            }.sources
           end
         end
       end

data/lib/schema_plus/core/active_record/connection_adapters/sqlite3_adapter.rb

@@ -22,9 +22,9 @@ module SchemaPlus
             end
           end
 
-          def exec_query(sql, name=nil, binds=[])
-            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds) { |env|
-              env.result = super env.sql, env.query_name, env.binds
+          def exec_query(sql, name=nil, binds=[], prepare: false)
+            SchemaMonkey::Middleware::Query::Exec.start(connection: self, sql: sql, query_name: name, binds: binds, prepare: prepare) { |env|
+              env.result = super env.sql, env.query_name, env.binds, prepare: env.prepare
             }.result
           end
 
@@ -34,12 +34,11 @@ module SchemaPlus
             }.index_definitions
           end
 
-          def tables(query_name=nil, table_name=nil)
-            SchemaMonkey::Middleware::Schema::Tables.start(connection: self, query_name: query_name, table_name: table_name, tables: []) { |env|
-              env.tables += super env.query_name, env.table_name
-            }.tables
+          def data_sources
+            SchemaMonkey::Middleware::Schema::DataSources.start(connection: self, sources: []) { |env|
+              env.sources += super
+            }.sources
           end
-
         end
       end
     end

data/lib/schema_plus/core/active_record/schema_dumper.rb

@@ -66,8 +66,9 @@ module SchemaPlus
               env.table.pname = m[:name]
               env.table.options = m[:options].strip
               env.table.trailer = m[:trailer].split("\n").map(&:strip).reject{|s| s.blank?}
-              env.table.columns = m[:columns].strip.split("\n").map { |col|
-                m = col.strip.match %r{
+              table_objects = m[:columns].strip.split("\n").map { |col|
+                cs = col.strip
+                m = cs.match %r{
                 ^
                 t\.(?<type>\S+) \s*
                   [:'"](?<name>[^"\s]+)[,"]? \s*
@@ -75,31 +76,32 @@ module SchemaPlus
                   (?<options>.*)
                 $
                 }x
-                SchemaDump::Table::Column.new name: m[:name], type: m[:type], options: eval("{" + m[:options] + "}"), comments: []
-              }
+                if !m.nil?
+                  SchemaDump::Table::Column.new name: m[:name], type: m[:type], options: eval("{" + m[:options] + "}"), comments: []
+                else
+                  m = cs.match %r{
+                  ^
+                  t\.index \s*
+                    \[(?<index_cols>.*?)\] \s*
+                    , \s*
+                    name\: \s* [:'"](?<name>[^"\s]+)[,"]? \s*
+                    ,? \s*
+                    (?<options>.*)
+                  $
+                  }x
+                  if m.nil?
+                    nil
+                  else
+                    index_cols = m[:index_cols].tr(%q{'":}, '').strip.split(/\s*,\s*/)
+                    SchemaDump::Table::Index.new name: m[:name], columns: index_cols, options: eval("{#{m[:options]}}")
+                  end
+                end
+              }.reject { |o| o.nil? }
+              env.table.columns = table_objects.select { |o| o.is_a? SchemaDump::Table::Column }
+              env.table.indexes = table_objects.select { |o| o.is_a? SchemaDump::Table::Index }
             end
           end
         end
-
-        def indexes(table, _)
-          SchemaMonkey::Middleware::Dumper::Indexes.start(dumper: self, connection: @connection, dump: @dump, table: @dump.tables[table]) do |env|
-            stream = StringIO.new
-            super env.table.name, stream
-            env.table.indexes += stream.string.split("\n").map { |string|
-              m = string.strip.match %r{
-              ^
-              add_index \s*
-                [:'"](?<table>[^'"\s]+)['"]? \s* , \s*
-                (?<columns>.*) \s*
-                name: \s* [:'"](?<name>[^'"\s]+)['"]? \s*
-                (, \s* (?<options>.*))?
-                $
-              }x
-              columns = m[:columns].tr(%q{[]'":}, '').strip.split(/\s*,\s*/)
-              SchemaDump::Table::Index.new name: m[:name], columns: columns, options: eval("{#{m[:options]}}")
-            }
-          end
-        end
       end
     end
   end

data/lib/schema_plus/core/middleware.rb

@@ -3,7 +3,7 @@ module SchemaPlus
     module Middleware
       module Query
         module Exec
-          ENV = [:connection, :sql, :query_name, :binds, :result]
+          ENV = [:connection, :sql, :query_name, :binds, :prepare, :result]
         end
       end
 
@@ -16,12 +16,9 @@ module SchemaPlus
           ENV = [:connection, :query_name, :table_name, :index_definitions]
         end
 
-        module Tables
-          # :database and :like are only for mysql
-          # :table_name is only for sqlite3
-          ENV = [:connection, :query_name, :table_name, :database, :like, :tables]
+        module DataSources
+          ENV = [:connection, :sources]
         end
-
       end
 
       module Migration
@@ -72,9 +69,6 @@ module SchemaPlus
         module Table
           ENV = [:dumper, :connection, :dump, :table]
         end
-        module Indexes
-          ENV = [:dumper, :connection, :dump, :table]
-        end
       end
 
       module Model

data/lib/schema_plus/core/schema_dump.rb

@@ -63,20 +63,22 @@ module SchemaPlus
           stream.puts " do |t|"
           typelen = columns.map{|col| col.type.length}.max
           namelen = columns.map{|col| col.name.length}.max
+          indexes
           columns.each do |column|
             stream.write "    "
             column.assemble(stream, typelen, namelen)
             stream.puts ""
           end
-          statements.each do |statement|
-            stream.puts "    #{statement}"
-          end
-          stream.puts "  end"
+          stream.puts "" unless indexes.empty?
           indexes.each do |index|
-            stream.write "  add_index #{pname.inspect}, "
+            stream.write "    t.index "
             index.assemble(stream)
             stream.puts ""
           end
+          statements.each do |statement|
+            stream.puts "    #{statement}"
+          end
+          stream.puts "  end"
           trailer.each do |statement|
             stream.puts "  #{statement}"
           end

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "1.0.2"
+    VERSION = "2.0.1"
   end
 end

data/lib/schema_plus/core.rb

@@ -9,7 +9,6 @@ module SchemaPlus
         DIR = Pathname.new(__FILE__).dirname + "core/active_record/connection_adapters"
         autoload :PostgresqlAdapter,     DIR + "postgresql_adapter"
         autoload :Mysql2Adapter,         DIR + "mysql2_adapter"
-        autoload :AbstractMysqlAdapter,  DIR + "abstract_mysql_adapter"
         autoload :Sqlite3Adapter,        DIR + "sqlite3_adapter"
       end
     end

data/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
-    - 2.1.5
+    - 2.3.0
 activerecord:
-    - 4.2
+    - 5.0
 db:
     - mysql2
     - sqlite3

data/schema_plus_core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 4.2"
+  gem.add_dependency "activerecord", "~> 5.0"
   gem.add_dependency "schema_monkey", "~> 2.1"
   gem.add_dependency "its-it", "~> 1.2"
 
@@ -26,7 +26,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0.0"
   gem.add_development_dependency "rspec-given"
-  gem.add_development_dependency "schema_dev", "~> 3.6"
+  gem.add_development_dependency "schema_dev", "~> 3.7"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "its-it"
 end

data/spec/column_spec.rb

@@ -39,7 +39,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
 
     context "when add ordinary column" do
       When { migration.create_table("things") { |t| t.integer "test_column" } }
-      Then { expect(spy).to eq [
+      Then { expect(spy).to match_array [
         { column_name: "id", type: :primary_key, implements_reference: nil },
         { column_name: "test_column", type: :integer, implements_reference: nil }
       ] }
@@ -49,7 +49,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
 
       context "when add reference using t.#{method}" do
         When { migration.create_table("things") { |t| t.send method, "test_reference" } }
-        Then { expect(spy).to eq [
+        Then { expect(spy).to match_array [
           { column_name: "id", type: :primary_key, implements_reference: nil },
           { column_name: "test_reference_id", type: :reference, implements_reference: nil },
           { column_name: "test_reference_id", type: :integer, implements_reference: true }
@@ -58,7 +58,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
 
       context "when add polymorphic reference using t.#{method}" do
         When { migration.create_table("things") { |t| t.send method, "test_reference", polymorphic: true } }
-        Then { expect(spy).to eq [
+        Then { expect(spy).to match_array [
           { column_name: "id", type: :primary_key, implements_reference: nil },
           { column_name: "test_reference_id", type: :reference, implements_reference: nil },
           { column_name: "test_reference_id", type: :integer, implements_reference: true },
@@ -76,7 +76,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
       context "when add reference using migration.add_reference" do
 
         When { migration.add_reference("things", "test_reference") }
-        Then { expect(spy).to eq [
+        Then { expect(spy).to match_array [
           { column_name: "test_reference_id", type: :reference, implements_reference: nil },
           { column_name: "test_reference_id", type: :integer, implements_reference: true }
         ] }
@@ -87,7 +87,7 @@ describe SchemaMonkey::Middleware::Migration::Column do
         When {
           migration.add_reference("things", "test_reference", polymorphic: true)
         }
-        Then { expect(spy).to eq [
+        Then { expect(spy).to match_array [
           { column_name: "test_reference_id", type: :reference, implements_reference: nil },
           { column_name: "test_reference_id", type: :integer, implements_reference: true },
           { column_name: "test_reference_type", type: :string, implements_reference: true }

data/spec/dumper_spec.rb

@@ -27,18 +27,13 @@ module TestDumper
             column.options[:option] = middleware.to_s
             column.comments << "comment: #{middleware}"
           end
+          if index = env.table.indexes.first
+            index.options[:option] = middleware.to_s
+          end
           env.table.statements << "statement: #{middleware}"
           env.table.trailer << "trailer: #{middleware}"
         end
       end
-      module Indexes
-        include Enableable
-        def after(env)
-          return unless env.table.indexes.any?
-          return unless middleware = enabled_middleware(TestDumper, env)
-          env.table.indexes.first.options[:option] = middleware.to_s
-        end
-      end
     end
   end
 end
@@ -93,13 +88,9 @@ describe SchemaMonkey::Middleware::Dumper do
     Then { expect(dump).to match(/t[.]integer.*:option=>"#{middleware}" \# comment: #{middleware}/) }
     Then { expect(dump).to match(/statement: #{middleware}\s+end\s+(add_index.*)?\s+trailer: #{middleware}/) }
     Then { expect(dump).to match(/could not dump table.*custom_table.*unknown type.*custom_type/mi) } if TestCustomType
+    Then { expect(dump).to match(/t[.]index.*:option=>"#{middleware}"/) }
   end
 
-  context TestDumper::Middleware::Dumper::Indexes do
-    Then { expect(dump).to match(/add_index.*:option=>"#{middleware}"/) }
-  end
-
-
   private
 
   def middleware

data/spec/middleware_spec.rb

@@ -25,11 +25,12 @@ describe SchemaMonkey::Middleware do
   context SchemaMonkey::Middleware::Schema do
 
     context TestReporter::Middleware::Schema::Define do
+      ActiveRecord::Schema.define {}
       Then { expect_middleware { ActiveRecord::Schema.define { } } }
     end
 
-    context TestReporter::Middleware::Schema::Tables do
-      Then { expect_middleware { connection.tables() } }
+    context TestReporter::Middleware::Schema::DataSources do
+      Then { expect_middleware { connection.data_sources() } }
     end
 
     context TestReporter::Middleware::Schema::Indexes do
@@ -48,7 +49,7 @@ describe SchemaMonkey::Middleware do
       Then { expect_middleware(enable: {type: :reference}, env: {column_name: "ref_id"}) { migration.add_reference("things", "ref") } }
 
       Given(:change) {
-        Class.new ::ActiveRecord::Migration do
+        Class.new ::ActiveRecord::Migration[5.0] do
           def change
             change_table("things") do |t|
               t.integer "column2"
@@ -136,16 +137,11 @@ describe SchemaMonkey::Middleware do
       Then { expect_middleware(env: {table: { name: "things"} }) { dump }  }
     end
 
-    context TestReporter::Middleware::Dumper::Indexes do
-      Then { expect_middleware(env: {table: { name: "things"} }) { dump }  }
-    end
-
     private
 
     def dump
       ::ActiveRecord::SchemaDumper.dump(connection, StringIO.new)
     end
-
   end
 
   def table_statement(method, *args)

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ RSpec.configure do |config|
       begin
         example.run
       ensure
-        ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.data_sources.each do |table|
           ActiveRecord::Migration.drop_table table, force: :cascade
         end
       end

data/spec/support/enableable.rb

@@ -1,3 +1,5 @@
+require "its-it"
+
 module Enableable
 
   def enabled_middleware(root, env)

data/spec/support/test_reporter.rb

@@ -27,7 +27,7 @@ module TestReporter
     module Schema
       module Define ;                   include Notify ; end
       module Indexes ;                  include Notify ; end
-      module Tables ;                   include Notify ; end
+      module DataSources ;              include Notify ; end
     end
 
     module Migration
@@ -56,7 +56,6 @@ module TestReporter
       module Initial ;                  include Notify ; end
       module Tables ;                   include Notify ; end
       module Table ;                    include Notify ; end
-      module Indexes ;                  include Notify ; end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: schema_monkey
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: its-it
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides an internal extension API to ActiveRecord, in the form of middleware-style
   callback stacks
 email:
@@ -165,14 +179,13 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.base
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 - lib/schema_plus/core.rb
 - lib/schema_plus/core/active_record/base.rb
 - lib/schema_plus/core/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus/core/active_record/connection_adapters/abstract_mysql_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/sqlite3_adapter.rb
@@ -213,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides an internal extension API to ActiveRecord

data/lib/schema_plus/core/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -1,17 +0,0 @@
-module SchemaPlus
-  module Core
-    module ActiveRecord
-      module ConnectionAdapters
-        module AbstractMysqlAdapter
-          module SchemaCreation
-            def visit_TableDefinition(o)
-              SchemaMonkey::Middleware::Sql::Table.start(caller: self, connection: self.instance_variable_get('@conn'), table_definition: o, sql: SqlStruct::Table.new) { |env|
-                env.sql.parse! super env.table_definition
-              }.sql.assemble
-            end
-          end
-        end
-      end
-    end
-  end
-end